test2
Merge branch 'master' of https://github.com/ZeROasc/Unknown-Hero-2.git

Conflicts:
	unknown-hero-2/src/main/java/prog/unknown_hero/core/GameController.java
Merge branch 'master' of https://github.com/ZeROasc/Unknown-Hero-2.git
tom_v??
Merge branch 'master' of https://github.com/ZeROasc/Unknown-Hero-2.git