template whitespace
Merge branch 'whitespace-dev' into prod

Conflicts:
	chat/templates/chat/chatmessage_detail.html