Merge branch 'master' into jgrpp

# Conflicts:
#	src/ai/ai_core.cpp
#	src/ai/ai_gui.cpp
#	src/ai/ai_instance.cpp
#	src/console_cmds.cpp
#	src/engine_type.h
#	src/game/game_gui.cpp
#	src/game/game_instance.cpp
#	src/goal.cpp
#	src/goal_cmd.h
#	src/lang/english.txt
#	src/lang/estonian.txt
#	src/network/network_client.cpp
#	src/newgrf.cpp
#	src/newgrf_generic.h
#	src/openttd.cpp
#	src/saveload/saveload.h
#	src/script/api/script_log.cpp
#	src/script/api/script_town.cpp
#	src/settings_table.cpp
#	src/station_cmd.cpp
#	src/station_cmd.h
#	src/station_map.h
#	src/strings.cpp
#	src/table/settings/difficulty_settings.ini
#	src/table/settings/gui_settings.ini
#	src/tbtr_template_gui_main.h
#	src/timetable_cmd.cpp
#	src/timetable_cmd.h
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_gui.cpp
#	src/water_cmd.cpp

src/script/api/script_controller.cpp

@@ -18,7 +18,7 @@
 #include "../script_info.hpp"
 #include "../script_instance.hpp"
 #include "script_log.hpp"
-#include "../../ai/ai_gui.hpp"
+#include "../script_gui.h"
 #include "../../settings_type.h"
 #include "../../network/network.h"
 
@@ -56,7 +56,7 @@
 
 	/* Inform script developer that their script has been paused and
 	 * needs manual action to continue. */
-	ShowAIDebugWindow(ScriptObject::GetRootCompany());
+	ShowScriptDebugWindow(ScriptObject::GetRootCompany());
 
 	if ((_pause_mode & PM_PAUSED_NORMAL) == PM_UNPAUSED) {
 		ScriptObject::DoCommand(0, PM_PAUSED_NORMAL, 1, CMD_PAUSE);