Merge branch 'auto_timetables-sx' into jgrpp

Conflicts:
	src/saveload/extended_ver_sl.cpp

src/settings_gui.cpp

@@ -1634,6 +1634,7 @@ static SettingsContainer &GetSettingsTree()
 			company->Add(new SettingEntry("vehicle.servint_roadveh"));
 			company->Add(new SettingEntry("vehicle.servint_ships"));
 			company->Add(new SettingEntry("vehicle.servint_aircraft"));
+			company->Add(new SettingEntry("vehicle.auto_timetable_by_default"));
 		}
 
 		SettingsPage *accounting = main->Add(new SettingsPage(STR_CONFIG_SETTING_ACCOUNTING));