Merge origin/master

Conflicts:
	src/wrath/client/Game.java