Merge
Merge branch 'master' of https://github.com/RoOoBerT/awar-client.git

Conflicts:
	src/main/resources/images/map/ground/dirt-iso2.png
	src/main/resources/images/map/ground/grass-iso2.png
	src/main/resources/images/map/ground/water-iso2.png