Merge branch 'master' into jgrpp

# Conflicts:
#	src/autoreplace_cmd.cpp
#	src/company_base.h
#	src/company_gui.cpp
#	src/cpu.cpp
#	src/debug.h
#	src/group.h
#	src/group_cmd.cpp
#	src/house.h
#	src/industry.h
#	src/newgrf_house.cpp
#	src/news_type.h
#	src/openttd.cpp
#	src/saveload/company_sl.cpp
#	src/settings_type.h
#	src/sl/oldloader_sl.cpp
#	src/story.cpp
#	src/table/town_land.h
#	src/viewport.cpp

src/news_type.h

@@ -12,6 +12,7 @@
 
 #include "core/enum_type.hpp"
 #include "date_type.h"
+#include "gfx_type.h"
 #include "strings_type.h"
 #include "sound_type.h"
 #include <vector>
@@ -161,8 +162,8 @@ struct CompanyNewsInformation : NewsAllocatedData {
 	std::string president_name;     ///< The name of the president
 	std::string other_company_name; ///< The name of the company taking over this one
 
-	uint32_t face; ///< The face of the president
-	byte colour;   ///< The colour related to the company
+	uint32_t face;                  ///< The face of the president
+	Colours colour;                 ///< The colour related to the company
 
 	CompanyNewsInformation(const struct Company *c, const struct Company *other = nullptr);
 };