Merge branch 'master' of https://github.com/ZeroK-RTS/Zero-K-Infrastructure into whr

Author: DeinFreund

Shared/LobbyClient/Protocol/Messages.cs

@@ -150,6 +150,8 @@ public class Register
 
         public string SteamAuthToken { get; set; }
 
+        public string Email { get; set; }
+
         public long UserID { get; set; }
     }
 

Zero-K.info/Views/Maps/Detail.cshtml

@@ -29,9 +29,6 @@
         <a href='/Resources/@(m.HeightmapName)' class="">
             <img src='/Resources/@(m.HeightmapName)' style='width:@(size.Width)px; height:@(size.Height)px' class='js_zoom' />
         </a>
-        <a href='/Resources/@(m.MetalmapName)' class="">
-            <img src='/Resources/@(m.MetalmapName)' style='width:@(size.Width)px; height:@(size.Height)px' class='js_zoom' />
-        </a>
     </div>
     <h2>@m.InternalName 
 	@if (m.MapSupportLevel >= MapSupportLevel.MatchMaker) { 

ZkLobbyServer/LoginChecker.cs

@@ -179,6 +179,7 @@ public async Task<RegisterResponse> DoRegister(Register register, string ip)
                 acc.SetPasswordHashed(register.PasswordHash);
                 acc.SetName(register.Name);
                 acc.SetAvatar();
+                acc.Email = register.Email;
                 if (info != null)
                 {
                     var existingBySteam = db.Accounts.FirstOrDefault(x => x.SteamID == info.steamid);