Merge branch 'master'

AUTHORS

@@ -32,15 +32,15 @@ ScummVM Team
        Max Horn              - (retired)
        Travis Howell
        Pawel Kolodziejski    - Codecs, iMUSE, Smush, etc.
-       Gregory Montoir
+       Gregory Montoir       - (retired)
        Eugene Sandulenko     - FT INSANE, MM NES, MM C64, game detection,
                                Herc/CGA
        Ludvig Strigeus       - (retired)
 
     HE:
        Jonathan Gray         - (retired)
        Travis Howell
-       Gregory Montoir
+       Gregory Montoir       - (retired)
        Eugene Sandulenko
 
     AGI:
@@ -67,10 +67,13 @@ ScummVM Team
     Cine:
        Vincent Hamm          - (retired)
        Pawel Kolodziejski
-       Gregory Montoir
+       Gregory Montoir       - (retired)
        Kari Salminen
        Eugene Sandulenko
 
+    Composer:
+       Alyssa Milburn
+
     CruisE:
        Paul Gilbert
        Vincent Hamm          - (retired)
@@ -86,7 +89,7 @@ ScummVM Team
     DreamWeb:
        Torbjorn Andersson
        Bertrand Augereau
-       Vladimir Menshakov
+       Vladimir Menshakov    - (retired)
 
     Gob:
        Torbjorn Andersson
@@ -108,7 +111,7 @@ ScummVM Team
        Torbjorn Andersson    - VQA Player
        Oystein Eftevaag
        Florian Kagerer
-       Gregory Montoir
+       Gregory Montoir       - (retired)
        Johannes Schickel
 
     Lastexpress:
@@ -119,12 +122,6 @@ ScummVM Team
     Lure:
        Paul Gilbert
 
-    M4:
-       Torbjorn Andersson
-       Paul Gilbert
-       Benjamin Haisch
-       Filippos Karapetis
-
     MADE:
        Benjamin Haisch
        Filippos Karapetis
@@ -142,11 +139,13 @@ ScummVM Team
 
     Queen:
        David Eriksson        - (retired)
-       Gregory Montoir
+       Gregory Montoir       - (retired)
        Joost Peters
 
     SAGA:
        Torbjorn Andersson
+       Daniel Balsom         - Original engine reimplementation author
+                               (retired)
        Filippos Karapetis
        Andrew Kurushin
        Eugene Sandulenko
@@ -186,7 +185,7 @@ ScummVM Team
 
     TeenAgent:
        Robert Megone         - Help with callback rewriting
-       Vladimir Menshakov
+       Vladimir Menshakov    - (retired)
 
     Tinsel:
        Torbjorn Andersson
@@ -201,14 +200,14 @@ ScummVM Team
        Sylvain Dupont
 
     Touche:
-       Gregory Montoir
+       Gregory Montoir       - (retired)
 
     TsAGE:
        Arnaud Boutonne
        Paul Gilbert
 
     Tucker:
-       Gregory Montoir
+       Gregory Montoir       - (retired)
 
   Backend Teams
   -------------
@@ -432,6 +431,7 @@ Other contributions
 
     Spanish:
        Tomas Maidagan
+       Jordi Vilalta Prat
 
     Swedish:
        Hampus Flink
@@ -479,6 +479,7 @@ Other contributions
      Daniel Schepler       - Final MI1 CD music support, initial Ogg Vorbis
                              support
      Andre Souza           - SDL-based OpenGL renderer
+     Tom Frost             - WebOS port contributions
 
   FreeSCI Contributors
   --------------------
@@ -537,6 +538,7 @@ Other contributions
 
 Special thanks to
 *****************
+   Daniel Balsom    - For the original Reinherit (SAGA) code
    Sander Buskens   - For his work on the initial reversing of Monkey2
    Canadacow        - For the original MT-32 emulator
    Kevin Carnes     - For Scumm16, the basis of ScummVM's older gfx codecs
@@ -557,6 +559,8 @@ Special thanks to
    Tristan          - For additional work on the original MT-32 emulator
    James Woodcock   - Soundtrack enhancements
 
+   Some icons by Yusuke Kamiyamane
+
    Tony Warriner and everyone at Revolution Software Ltd. for sharing with us
    the source of some of their brilliant games, allowing us to release
    Beneath a Steel Sky as freeware... and generally being supportive above