initial spacing
Merge branch 'whitespace' into whitespace-dev

Conflicts:
	chat/urls.py
	requirements.txt
	telelogue/settings.py
whitespace changes for urls and initial template
prepare to append to import list
preparing to append to import list
Merge branch 'whitespace' into whitespace-dev

Conflicts:
	chat/urls.py
	chat/views.py
Merge branch 'backports' into whitespace-dev
Merge branch 'master' into whitespace

Conflicts:
	chat/urls.py
	chat/views.py
	requirements.txt
	telelogue/settings.py
Merge branch 'whitespace-dev' into whitespace

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

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

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

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

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