Merge branch 'whitespace' into template-markup

Conflicts:
	chat/templates/auth/user_detail.html
	chat/templates/chat/chatmessage_detail.html
	chat/templates/chat/chatmessage_list.html
Merge branch 'template-markup' into prod

Conflicts:
	chat/templates/chat/chatmessage_list.html