Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/Chat

# Conflicts:
#	PrototypChat/.vs/PrototypChat/v15/.suo

.gitignore

@@ -9,3 +9,4 @@
 /BeWoPlanerChat/bewoplaner-chat-android/app/*.apk
 /PrototypChat/.vs/PrototypChat/v14
 /PrototypChat/.vs/PrototypChat/v15/sqlite3
+/PrototypChat/.vs/PrototypChat/v15

ChatController/LoginControl.xaml.cs

@@ -45,7 +45,7 @@ namespace ChatController
         private string _chatCode = "";
         private string _kundennummer = "";
         private string _authToken = "";
-
+        private string _version = "1.1";
 
         public LoginControl()
         {
@@ -54,8 +54,8 @@ namespace ChatController
             //encrypt verschlüsselte datei
             LeseDateiFallsVorhanden();
 
-            var version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+            //var version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
-            lblVersion.Content = String.Format("Version: {0}", version);
+            lblVersion.Content = String.Format("Version: {0}", _version);
         }
 
         private void AnmeldenButton_OnClick(object sender, RoutedEventArgs e)

PrototypChat/PrototypChat.csproj

@@ -67,6 +67,9 @@
   <PropertyGroup>
     <SignManifests>true</SignManifests>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>ownchat_favicon.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\libs\Newtonsoft.Json.dll</HintPath>
@@ -166,5 +169,8 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="ownchat_favicon.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>