Lots of stuff.
Merge branch 'master' of https://github.com/flyingcircle/AdvancedBattle

Conflicts:
	src/me/capstone/advancedbattle/manager/GameManager.java