Merge remote-tracking branch 'origin/map-fixes' into texture

Conflicts:
	game/CraftGame.cpp
Merge remote-tracking branch 'origin/hsr' into texture
Textures added
Grass texture on top
Added ambient and diffuse lighting
Texturen angepasst
Merge branch 'hsr'

Conflicts:
	game/ChunkView.cpp