Cleanup
Merge branch 'master' of github.com:iamhj/HEROES

Conflicts:
	MavenProject/mavenheroes/core/src/main/java/model/player/Troop.java
	MavenProject/mavenheroes/core/src/main/java/screens/BattleScreenFactory.java
Merge branch 'master' of github.com:iamhj/HEROES
Cleaned up
Merge branch 'master' of github.com:iamhj/HEROES