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

Conflicts:
	apps/api/handlers/library_handlers.py

diff --cc apps/api/handlers/library_handlers.py
index 9751fef,aef1e9c..c84cab8
--- 1/apps/api/handlers/library_handlers.py
--- 2/apps/api/handlers/library_handlers.py
+++ b/apps/api/handlers/library_handlers.py
@@@ -9,9 -9,7 +9,8 @@@ __date__ = "$2009-09-25 15:49:50$
  __doc__ = "Module documentation."
  
  from piston.handler import BaseHandler, AnonymousBaseHandler
 +from django.http import HttpResponse
  
- import re
  from datetime import date
  
  from django.core.urlresolvers import reverse

diff --cc apps/api/resources.py
Simple merge