Stats on user profile
Updated TODO
Merge branch 'permalinks' into dev
Merge branch 'master' into whitespace

Conflicts:
	chat/templates/chat/chatmessage_list.html
Merge branch 'whitespace' into whitespace-dev
Merge branch 'dev' into whitespace-dev

Conflicts:
	chat/templates/auth/user_detail.html
Merge branch 'whitespace-dev' into template-markup
Merge branch 'template-markup' into prod

Conflicts:
	TODO.txt