Merge remote-tracking branch 'origin/master'

Conflicts:
	login.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	login.pyc
	main.py
	onlineGame.py