Underway
Merge branch 'master' into skyrising-dev2

Conflicts:
	Game Client/src/de/gymdon/inf1315/game/render/MapRenderer.java
	Game Commons/src/de/gymdon/inf1315/game/MapGenerator.java
Merge branch 'master' into skyrising-dev2
Fixed size
Merge remote branch 'origin/master' into skyrising-dev2
Merge remote branch 'origin/skyrising-dev2'

Conflicts:
	Game Client/src/de/gymdon/inf1315/game/render/MapRenderer.java
Merge remote branch 'origin/master'