Merge
Conflicts:
	src/GameEngine/TextureRenderer.cpp
	src/Map/MapTile.cpp
	src/Screen/MapScreen.cpp
	src/Screen/ScreenManager.cpp
Merge with develop