Merge branch 'master' of https://git.hofmannnet.myhome-server.de/Kilian/DOCSIS-Toolkit

# Conflicts:
#	Docsis Toolkit.xcodeproj/project.pbxproj
#	Docsis Toolkit.xcodeproj/xcshareddata/xcschemes/All.xcscheme
#	Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Converter.xcscheme
#	Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Graphic Analysis 2.xcscheme
#	Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Logger4.xcscheme
#	Graphic Analysis 2/Info.plist
#	Graphic Analysis 2/buildnum.ver

Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Logger4.xcscheme

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
+<<<<<<< HEAD
    LastUpgradeVersion = "1020"
+=======
+   LastUpgradeVersion = "1150"
+>>>>>>> fe13d1c73951c5cae7f44dd2147bdbe028163299
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +31,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +40,8 @@
             ReferencedContainer = "container:Docsis Toolkit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +63,6 @@
             ReferencedContainer = "container:Docsis Toolkit.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"