login page fixed if wrong user
Merge remote-tracking branch 'origin/master'

Conflicts:
	mysite/mysite/views.py