Client functions
Merge branch 'master' of https://github.com/ZRazor/MMORPG

Conflicts:
	web/game.jsp