Add settings on a organisation wide and per user per organisation basis
Working on view to update settings
Merge branch 'develop' into notification_settings

Conflicts:
	deploy/pip_packages.txt
	django/econsensus/econsensus/settings.py
	django/econsensus/econsensus/urls.py
	django/econsensus/publicweb/tests/factories.py
	django/econsensus/publicweb/views.py
Create working view for notification settings
Add link to notification settings view
Default notification level is for main items only

The default notification level is to get notifications only for the
creation of main items or changes to their status.
Get the form looking pretty
Add organisation to UserNotificationSettings view context

This means that the navigation menu is displayed in the notification
settings page.
Have a consistent url style for settings
Refactor code

Replace 'OrganizationFactory.build(id=2)' with 'get_organization()'
Replace 'Mock' with 'MagicMock'
Remove unused imports
Ignore my link to deploy/bootstrap.py
Ignore personal settings file
Merge branch 'develop' into notification_settings

Conflicts:
	django/econsensus/econsensus/local_settings.py.dev_fasttests
	django/econsensus/econsensus/settings.py
	django/econsensus/publicweb/forms.py
	django/econsensus/publicweb/urls.py
	django/econsensus/publicweb/views.py
Merge branch 'develop' into notification_settings

Conflicts:
	django/econsensus/publicweb/templates/decision_list.html
Remove get_context_data from view (doesn't fit with similar pages)
Change urls to avoid conflict with livesettings
Get rid of warnings
Rename migrations to have a unique number
Change tests to make them more readable
Restructure code

Move the creation of a root item from the view into the form.