Fixing enum problem and mistakes in MVC
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/core/controller/gameplay/HeroController.java
Merge results