quickpost
Merge branch 'quickpost' into dev
Merge branch 'dev' into whitespace

Conflicts:
	chat/templates/chat/chatmessage_list.html
indentation
Merge branch 'whitespace' into template-markup

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