Merge branch 'master' of https://github.com/arneb/django-messages

Conflicts:
	django_messages/forms.py
	django_messages/models.py
	django_messages/views.py

Author: arsham

django_messages/admin.py

@@ -7,7 +7,7 @@
 from django_messages.utils import get_user_model
 User = get_user_model()
 
-if "notification" in settings.INSTALLED_APPS:
+if "notification" in settings.INSTALLED_APPS and getattr(settings, 'DJANGO_MESSAGES_NOTIFY', True):
     from notification import models as notification
 else:
     notification = None

django_messages/management.py

@@ -2,7 +2,7 @@
 from django.conf import settings
 from django.utils.translation import ugettext_noop as _
 
-if "notification" in settings.INSTALLED_APPS:
+if "notification" in settings.INSTALLED_APPS and getattr(settings, 'DJANGO_MESSAGES_NOTIFY', True):
     from notification import models as notification
 
     def create_notice_types(app, created_models, verbosity, **kwargs):

django_messages/signals.py

@@ -15,7 +15,7 @@
     # Already configured (installation is complete)
     pass
 
-if "notification" in settings.INSTALLED_APPS:
+if "notification" in settings.INSTALLED_APPS and getattr(settings, 'DJANGO_MESSAGES_NOTIFY', True):
     from notification import models as notification
     from django_messages.forms import ComposeForm
     from django_messages.views import delete, undelete, unread, purge