Merge branch 'master' into jgrpp

# Conflicts:
#	src/ground_vehicle.cpp
#	src/viewport.cpp

src/genworld_gui.cpp

@@ -913,7 +913,7 @@ void StartScenarioEditor()
  * Start a normal game without the GUI.
  * @param seed The seed of the new game.
  */
-void StartNewGameWithoutGUI(uint seed)
+void StartNewGameWithoutGUI(uint32 seed)
 {
 	/* GenerateWorld takes care of the possible GENERATE_NEW_SEED value in 'seed' */
 	_settings_newgame.game_creation.generation_seed = seed;