Conflicts:
apps/catalogue/locale/pl/LC_MESSAGES/django.mo
apps/catalogue/locale/pl/LC_MESSAGES/django.po
apps/wolnelektury_core/static/css/base.css
apps/wolnelektury_core/static/css/book_box.css
apps/wolnelektury_core/static/css/cite.css
apps/wolnelektury_core/static/css/header.css
apps/wolnelektury_core/static/css/master.book.css
apps/wolnelektury_core/static/css/picture_box.css
apps/wolnelektury_core/static/css/screen.css
wolnelektury/settings/static.py