support the Django 1.5 custom user model
Merge remote-tracking branch 'origin/custom-user-models' into scenemachine

Conflicts:
	account/models.py
	account/tests/test_views.py
	account/views.py

Conflicts:
	account/models.py
	account/tests/test_views.py
	account/views.py
whitespace-cleanup
Merge branch 'custom-user-models' into develop
Merge remote-tracking branch 'github/develop' into develop