Merge branch 'master' into jgrpp

# Conflicts:
#	CMakeLists.txt
#	cmake/CompileFlags.cmake
#	src/bridge_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/town_sl.cpp
#	src/screenshot.cpp
#	src/screenshot.h
#	src/toolbar_gui.cpp
#	src/town.h
#	src/town_cmd.cpp

src/genworld.cpp

@@ -151,7 +151,6 @@ static void _GenerateWorld()
 					}
 					return;
 				}
-				UpdateTownCargoBitmap();
 				GenerateIndustries();
 				GenerateObjects();
 				GenerateTrees();