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

Conflicts:
	chat/templates/chat/chatmessage_list.html
indentation