user view fix and other fixes
not a thing
Merge branch 'fry' into dev

Conflicts:
	.gitignore
	app/user_auth_views.py