code cleanup
Merge branch 'master' of https://github.com/jasonfleischer/KingsNThings

Conflicts:
	KingNThings/src/com/game/services/GameService.java
	KingNThings/src/com/main/KingsNThingsAppFactory.java
	KingNThings/src/com/main/MVPApplication.java
	KingNThings/src/com/model/game/Game.java
	KingNThings/src/com/presenter/BoardPresenter.java
	KingNThings/src/com/view/CreatureDetailsView.java
	KingNThings/src/com/view/GameScreen.java
	KingNThings/src/com/view/ThingDetailsView.java