a lot of gui changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Game++ Tile/src/de/nerogar/game/Map.java