gotta have a head to have style
style from on high
Merge branch 'style' into dev
Merge branch 'master' into whitespace

Conflicts:
	chat/templates/chat/chatmessage_list.html