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

Conflicts:
	src/Map/Map.java
	src/Map/Tile.java
	src/Player/Unit.java
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/Map/Map.java
	src/Map/Tile.java
	src/Player/Unit.java