added BattleDialog
Merge branch 'master' of https://github.com/robatte/Hex
fixed battle-logig-bugs
Conflicts:
	scripts/game.coffee