Merge branch 'master' into jgrpp

# Conflicts:
#	src/music.cpp
#	src/script/api/script_company.cpp
#	src/script/api/script_event_types.cpp
#	src/script/api/script_group.cpp
#	src/script/api/script_object.cpp
#	src/script/api/script_road.cpp

src/script/api/script_game.cpp

@@ -9,6 +9,7 @@
 
 #include "../../stdafx.h"
 #include "script_game.hpp"
+#include "script_error.hpp"
 #include "../../command_type.h"
 #include "../../settings_type.h"
 #include "../../network/network.h"