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
reverted to using fixed https URLs for the bookmarklet
don't check in the mediathread.db file
Merge branch 'appsembler_develop' of github.com:appsembler/mediathread into appsembler_develop
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
Merge branch 'refs/heads/appsembler_develop' into feature/forms_refactor

Conflicts:
	media/css/mediathread.css
	mediathread/user_accounts/views.py