Merge remote-tracking branch 'origin/develop' into develop

ErgometerServer/DoctorThread.cs

@@ -50,6 +50,9 @@ namespace ErgometerServer
                     case NetCommand.CommandType.VALUESET:
                         server.SendToClient(input);
                         break;
+                    case NetCommand.CommandType.USER:
+                        server.AddUser(input.users);
+                        break;
                     default:
                         throw new FormatException("Unknown Command");
                 }

ErgometerServer/ErgometerServer.csproj

@@ -35,7 +35,7 @@
   <ItemGroup>
     <Reference Include="ErgometerLibrary, Version=1.0.2.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\ErgometerLibrary\ErgometerLibrary\ErgometerLibrary\bin\Debug\ErgometerLibrary.dll</HintPath>
+      <HintPath>..\..\ErgometerLibrary\ErgometerLibrary\bin\Debug\ErgometerLibrary.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

ErgometerServer/Server.cs

@@ -114,7 +114,7 @@ namespace ErgometerServer
             FileHandler.SaveUsers(users);
         }
 
-        private void AddUser(Dictionary<string, string> users)
+        public void AddUser(Dictionary<string, string> users)
         {
             foreach(KeyValuePair<string, string> user in users)
             {