added django messaging bar to the template
Merge branch 'refs/heads/appsembler_develop' into feature/messages
added messaging to registration/invite views
Merge branch 'refs/heads/appsembler_develop' into feature/messages
added messaging settings
Merge branch 'refs/heads/appsembler_develop' into feature/messages
fixed a typo
fixes for messaging
Redirect mediathread.appsembler.com/help to http://support.appsembler.com/knowledgebase/topics/39118-mediathread
reverted bookmarklet to http for now
Merge remote-tracking branch 'origin/appsembler_develop' into appsembler_develop
Merge pull request #3 from appsembler/feature/messages

Feature/messages
Merge pull request #6 from appsembler/redirect_help

Redirect mediathread.appsembler.com/help to http://support.appsembler.com/knowledgebase/topics/39118-mediathread
removed unnecessary call to /jsi18n in base.html
removed unnecessary call to /jsi18n in base.html
Merge remote-tracking branch 'origin/appsembler_develop' into appsembler_develop

Conflicts:
	mediathread/templates/base.html
pointed "create course" link on switch course page to our create course form
Merge remote-tracking branch 'origin/appsembler_develop' into redirect_getmediathread

Conflicts:
	mediathread/settings_shared.py
	mediathread/urls.py