separate whitespace from markup changes
Merge branch 'template_markup' into whitespace--template-markup

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