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

Conflicts:
	chat/templates/chat/home.html
whitespace