Merge branch 'master' of git@stigma:platforma

diff --combined apps/explorer/forms.py
index 81e9f26,1111b26..aa6b48a
--- 1/apps/explorer/forms.py
--- 2/apps/explorer/forms.py
+++ b/apps/explorer/forms.py
@@@ -9,9 -9,6 +9,9 @@@ class BookForm(forms.Form)
      content = forms.CharField(widget=forms.Textarea)
      commit_message = forms.CharField(required=False)
  
 +class BookUploadForm(forms.Form):
 +    file = forms.FileField()
 +
  class ImageFoldersForm(forms.Form):
      folders = forms.ChoiceField(required=False)
      
@@@ -64,5 -61,5 +64,5 @@@ class DublinCoreForm(forms.Form)
          old_rdf = doc.getroottree().find('//{http://www.w3.org/1999/02/22-rdf-syntax-ns#}RDF')
          old_rdf.getparent().remove(old_rdf)
          doc.insert(0, rdf)
-         repository.add_file(path, unicode(etree.tostring(doc), 'utf-8'))
+         repository.add_file(path, etree.tostring(doc, pretty_print=True, encoding=unicode))