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.cpp

@@ -39,6 +39,7 @@
 #include "window_func.h"
 #include "window_gui.h"
 #include "zoom_func.h"
+#include "group_gui_list.h"
 
 #include "tbtr_template_gui_main.h"
 #include "tbtr_template_gui_create.h"
@@ -49,9 +50,6 @@
 
 #include "safeguards.h"
 
-
-typedef GUIList<const Group*> GUIGroupList;
-
 enum TemplateReplaceWindowWidgets {
 	TRW_CAPTION,
 
@@ -582,8 +580,7 @@ public:
 		}
 
 		list.ForceResort();
-		extern bool GroupNameSorter(const Group * const &a, const Group * const &b);
-		list.Sort(&GroupNameSorter);
+		SortGUIGroupList(list);
 
 		AddParents(&list, INVALID_GROUP, 0);