Add GameState
Merge branch 'master' of https://github.com/arn3tt/WarOfKingdoms

Conflicts:
	android-app/src/br/edu/ufcg/ccc/projeto2/warofkingdoms/ui/GameActivity.java
	android-app/src/br/edu/ufcg/ccc/projeto2/warofkingdoms/util/Constants.java