Major Changes
Merge branch 'StefOre' of
https://github.com/orestisMelkonian/SA4_game.git into StefOre

Conflicts:
	src/main/java/ptoma/hexoral/map/Map.java