Merge branch 'pagination' into dev

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