replace breaks with divisions
Merge branch 'template-markup' into prod

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

Conflicts:
	chat/templates/chat/chatmessage_detail.html