Merge branch 'dev' into whitespace-dev

Conflicts:
	chat/urls.py
Merge branch 'whitespace-dev' into prod

Conflicts:
	chat/urls.py
urlconf whitespace
Merge branch 'whitespace-dev' into prod

Conflicts:
	chat/urls.py