fix login bugs
nothing chaged
Merge branch 'master' of https://github.com/sinkerplus/Actually

Conflicts:
	Auth_App/jsonservice.pyc
	Auth_App/templatetags/__init__.pyc
	Auth_App/views.pyc