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

diff --cc apps/explorer/views.py
Simple merge

diff --cc project/static/css/master.css
Simple merge

diff --cc project/urls.py
index cc433c0,d153f84..1ba97d6
--- 1/project/urls.py
--- 2/project/urls.py
+++ b/project/urls.py
@@@ -7,9 -7,10 +7,9 @@@ admin.autodiscover(
  
  
  urlpatterns = patterns('',
-     # Example:
+     # Explorer:
      url(r'^$', 'explorer.views.file_list', name='file_list'),
      url(r'^file/(?P<path>[^/]+)/$', 'explorer.views.file_xml', name='file_xml'),
 -    url(r'^html/(?P<path>[^/]+)/$', 'explorer.views.file_html', name='file_html'),
      url(r'^images/(?P<folder>[^/]+)/$', 'explorer.views.folder_images', name='folder_image'),
      url(r'^images/$', 'explorer.views.folder_images', {'folder': '.'}, name='folder_image_ajax'),