log in without address bar
Merge branch 'login_required' into dev
Merge branch 'dev' into whitespace

Conflicts:
	chat/templates/chat/home.html
Merge branch 'whitespace' into template-markup
Merge branch 'template-markup' into prod
whitespace
whitespace
Merge branch 'whitespace' into template-markup
Merge branch 'template-markup' into prod