Make the auth better
Merge remote-tracking branch 'origin/master'

Conflicts:
	handlers/auth.py