BattleState done except gameoverimages
Merge branch 'master' of https://github.com/tronster/ggj2014

Conflicts:
	games/GameModule/bin/Katseye.swf
	games/GameModule/src/BattleState.as
	games/GameModule/src/Resources.as