Minor bug fixing
Merge branch 'master' of github.com:iamhj/heroes

Conflicts:
	MavenProject/mavenheroes/core/src/main/java/model/player/Troop.java