Merge branch 'master' of git@stigma.nowoczesnapolska.org.pl:platforma

Conflicts:
	apps/explorer/views.py

diff --cc apps/explorer/views.py
index 7121e35,3ab7e67..79160f8
--- 1/apps/explorer/views.py
--- 2/apps/explorer/views.py
+++ b/apps/explorer/views.py
@@@ -1,15 -1,21 +1,14 @@@
 -# -*- coding: utf-8 -*-
 -from librarian import html
 -import hg, urllib2, time
 -
 -from django.utils import simplejson as json
 -
 -from librarian import dcparser, parser
 -from librarian import ParseError, ValidationError
 -
 -from django.views.generic.simple import direct_to_template
 +import urllib2
 +import hg
- from lxml import etree
- from librarian import html,dcparser
++from librarian import html, parser, dcparser, ParseError, ValidationError
  
  from django.conf import settings
 -from django.http import HttpResponseRedirect, HttpResponse
 -
 -from django.core.urlresolvers import reverse
 -from django.core.paginator import Paginator, InvalidPage, EmptyPage
 -
  from django.contrib.auth.decorators import login_required, permission_required
 +from django.core.paginator import Paginator, InvalidPage, EmptyPage
 +from django.core.urlresolvers import reverse
 +from django.http import HttpResponseRedirect, HttpResponse
 +from django.utils import simplejson as json
 +from django.views.generic.simple import direct_to_template
  
  from explorer import forms, models
  

diff --cc project/static/js/editor.js
Simple merge