Merge branch 'master' into jgrpp

# Conflicts:
#	CMakeLists.txt
#	bin/ai/CMakeLists.txt
#	bin/game/CMakeLists.txt
#	src/ai/ai_info.cpp
#	src/company_base.h
#	src/economy.cpp
#	src/game/game_info.cpp
#	src/gfx_type.h
#	src/linkgraph/linkgraph_gui.cpp
#	src/palette.cpp
#	src/palette_func.h
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/ship_cmd.cpp
#	src/train_cmd.cpp
#	src/vehicle_base.h
#	src/window.cpp
#	src/window_func.h

src/script/api/ai_changelog.hpp

@@ -13,10 +13,12 @@
  * functions may still be available if you return an older API version
  * in GetAPIVersion() in info.nut.
  *
- * \b 14.0
+ * \b 15.0
  *
  * This version is not yet released. The following changes are not set in stone yet.
  *
+ * \b 14.0
+ *
  * API additions:
  * \li AITimeMode
  * \li AITown::ROAD_LAYOUT_RANDOM

src/script/api/game_changelog.hpp

@@ -13,10 +13,12 @@
  * functions may still be available if you return an older API version
  * in GetAPIVersion() in info.nut.
  *
- * \b 14.0
+ * \b 15.0
  *
  * This version is not yet released. The following changes are not set in stone yet.
  *
+ * \b 14.0
+ *
  * API additions:
  * \li GSIndustry::GetConstructionDate
  * \li GSAsyncMode