Merge branch 'master' into jgrpp

# Conflicts:
#	src/company_gui.cpp
#	src/group_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_debug_gui.cpp
#	src/saveload/saveload.cpp

src/tbtr_template_gui_main.h

@@ -19,8 +19,6 @@
 #include "tbtr_template_vehicle.h"
 #include "tbtr_template_vehicle_func.h"
 
-typedef GUIList<const Group*> GUIGroupList;
-
 void ShowTemplateReplaceWindow();
 
 bool TemplateVehicleClicked(const TemplateVehicle *v);