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

Conflicts:
	src/core/view/gameplay/HeroView.java
Merge branch 'develop' of https://github.com/alexanderguk/Mad_Game into develop
Merge branch 'develop' of https://github.com/alexanderguk/Mad_Game into develop