New class for generation map, cleaning and refactoring (thx to
MrSchneeflug)
pre-merge commit
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/map_drawing/DisplayGrid.java
	src/map_drawing/Tile.java
	src/map_making/MainClass.java