Merge branch 'master' into prince

Conflicts:
	engines/plugins_table.h

AUTHORS

@@ -62,6 +62,10 @@ ScummVM Team
        Oliver Kiehl            - (retired)
        Ludvig Strigeus         - (retired)
 
+    AVALANCHE:
+       Peter Bozso
+       Arnaud Boutonne
+
     CGE:
        Arnaud Boutonne
        Paul Gilbert
@@ -240,6 +244,9 @@ ScummVM Team
     Wintermute:
        Einar Johan T. Somaaen
 
+    ZVision:
+       Adrian Astley
+
   Backend Teams
   -------------
     Android:
@@ -610,6 +617,8 @@ Special thanks to
    Jimmi Thogersen   - For ScummRev, and much obscure code/documentation
    Tristan           - For additional work on the original MT-32 emulator
    James Woodcock    - Soundtrack enhancements
+   Anton Yartsev     - For the original re-implementation of the ZVision
+                       engine
 
    Tony Warriner and everyone at Revolution Software Ltd. for sharing with us
    the source of some of their brilliant games, allowing us to release

devtools/credits.pl

@@ -541,6 +541,11 @@ sub add_paragraph {
 				add_person("Oliver Kiehl", "olki", "(retired)");
 				add_person("Ludvig Strigeus", "ludde", "(retired)");
 			end_section();
+
+			begin_section("AVALANCHE");
+				add_person("Peter Bozsó", "uruk", "");
+				add_person("Arnaud Boutonné", "Strangerke", "");
+			end_section();
 
 			begin_section("CGE");
 				add_person("Arnaud Boutonné", "Strangerke", "");
@@ -754,6 +759,10 @@ sub add_paragraph {
 			begin_section("Wintermute");
 				add_person("Einar Johan T. Sømåen", "somaen", "");
 			end_section();
+
+			begin_section("ZVision");
+				add_person("Adrian Astley", "RichieSams", "");
+			end_section();
 
 		end_section();
 
@@ -1155,6 +1164,7 @@ sub add_paragraph {
 			add_person("Jimmi Thøgersen", "", "For ScummRev, and much obscure code/documentation");
 			add_person("", "Tristan", "For additional work on the original MT-32 emulator");
 			add_person("James Woodcock", "", "Soundtrack enhancements");
+			add_person("Anton Yartsev", "Zidane", "For the original re-implementation of the ZVision engine");
 		end_persons();
 
 	add_paragraph(