z<saf
Merge branch 'dev_1.85' of https://github.com/OttMatiisen/Over-The-Galaxy into dev_1.85

Conflicts:
	src/world/entity/gui/hud/Map.java