Fixed problem of not able to login on localhost
Merge branch 'master' of https://github.com/yaoxiangg/PinnerSpace

Conflicts:
	main.pyc