Refactoring
Merge remote-tracking branch 'origin/alex' into alex

Conflicts:
	src/core/controller/HeroController.java