OnlineBattle update
Merge remote-tracking branch 'origin/master'

Conflicts:
	Onlinepage.py
	Onlinepage.pyc