Refactoring and architecture changes for MVC.
Merge remote-tracking branch 'origin/alex' into alex

Conflicts:
	src/core/controller/HeroController.java
Small fix (final added).