fixed merges with master

Author: albanm

djity/project/urls.py

@@ -26,6 +26,7 @@
     (r'^(?P<project_name>[-\w]+)/css/',include(css_urls)),
     # and search also
     (r'^(?P<project_name>[-\w]+)/search/',include(search_urls)),
+
 )
 
 #import urls from djity applications

djity/utils/decorators.py

@@ -114,8 +114,8 @@ def _new_func(*args,**kwargs):
                     context['info_message'] = request.GET['info_message']
 
             kwargs['context'] = context
-
-             # if module was not found by projet.update_context() raise 404
+             
+            # if module was not found by projet.update_context() raise 404
             if module_name and not 'module' in context:
                 context.message(_("This page does not exist on this project !"))
                 context["module"] = {'label':_('Page not found')}