Merge branch 'dev'

Conflicts:
	app/settings.py

diff --cc app/settings.py
index f5bed651d8a96243349fac57cd57c38af4aebf48,ab50677011c8df50d62b0d53d9e375ce8da61394..e4891ac285b005d1051390f332e4d77a7ecc42e7
--- 1/app/settings.py
--- 2/app/settings.py
+++ b/app/settings.py
@@@ -271,14 -271,8 +271,15 @@@ TEMPLATES = [{'APP_DIRS': False
                                                    'django.core.context_processors.request',
                                                    'django.core.context_processors.tz',
                                                    'mezzanine.conf.context_processors.settings',
-                                                   'mezzanine.pages.context_processors.page'),
+                                                   'mezzanine.pages.context_processors.page',
 -                                                  'organization.core.context_processors.static')}}]
++                                                  'organization.core.context_processors.static'),
 +                            'loaders': [
 +                                ('django.template.loaders.cached.Loader', [
 +                                    'django.template.loaders.filesystem.Loader',
 +                                    'django.template.loaders.app_directories.Loader',
 +                                ]),],
 +                          },
 +            }]
  
  # List of middleware classes to use. Order is important; in the request phase,
  # these middleware classes will be applied in the order given, and in the