Merge branch 'backports' into whitespace-dev
Merge branch 'master' into whitespace

Conflicts:
	chat/urls.py
	chat/views.py
	requirements.txt
	telelogue/settings.py
Merge branch 'whitespace-dev' into whitespace

Conflicts:
	chat/urls.py
Merge branch 'whitespace' into prod