Final changes on architecture & Django update in consequence
Merge branch 'master' of github.com:Jens84/Turbot

Conflicts:
	test/test_turbot.py