Merge branch 'master' of https://github.com/cccs-web/mayan-edms into cccs-web-master

Conflicts:
	mayan/settings/includes/common.py

mayan/settings/development.py

@@ -0,0 +1,30 @@
+from __future__ import absolute_import
+
+from .base import *
+
+DEBUG = True
+TEMPLATE_DEBUG = DEBUG
+
+ALLOWED_HOSTS = ['*']
+
+INTERNAL_IPS = ('127.0.0.1',)
+
+TEMPLATE_LOADERS = (
+    'django.template.loaders.filesystem.Loader',
+    'django.template.loaders.app_directories.Loader'
+)
+
+INSTALLED_APPS += (
+    'rosetta',
+    'django_extensions',
+    'debug_toolbar'
+)
+
+# Stop debug toolbar patching! (see https://github.com/django-debug-toolbar/django-debug-toolbar/issues/524)
+DEBUG_TOOLBAR_PATCH_SETTINGS = False
+
+TEMPLATE_CONTEXT_PROCESSORS += ('django.core.context_processors.debug',)
+
+WSGI_AUTO_RELOAD = True
+
+MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)