From: Vásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Date: Wed, 11 Oct 2017 13:02:40 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=7d11d4452c26c11ea81c0d188a44ff457b2548c5;p=mediacube.git

git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30585
---

diff --git a/client/Maestro/Maestro.csproj b/client/Maestro/Maestro.csproj
index bc9da6ad..d0ba3701 100644
--- a/client/Maestro/Maestro.csproj
+++ b/client/Maestro/Maestro.csproj
@@ -307,6 +307,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="Resources\installforge-installer-project.ifp" />
     <None Include="Resources\Pause.ico" />
     <None Include="Resources\Play.ico" />
     <None Include="Resources\Stop.ico" />
diff --git a/client/Maestro/Resources/AppIcon.ico b/client/Maestro/Resources/AppIcon.ico
deleted file mode 100644
index 8aa98e51..00000000
Binary files a/client/Maestro/Resources/AppIcon.ico and /dev/null differ
diff --git a/client/Maestro/Resources/configuration-ingest.json b/client/Maestro/Resources/configuration-ingest.json
index 2a2d3a31..dd21b53e 100644
--- a/client/Maestro/Resources/configuration-ingest.json
+++ b/client/Maestro/Resources/configuration-ingest.json
@@ -6,7 +6,7 @@
   "player": {
     "enabled": true,
     "autoStart": false,
-    "segmentEditor": false
+    "segmentEditor": true
   },
   "source": {
     "$type": "UNCSource",
diff --git a/client/Maestro/Resources/configuration-nexio.json b/client/Maestro/Resources/configuration-nexio.json
index e6a989ec..3154061e 100644
--- a/client/Maestro/Resources/configuration-nexio.json
+++ b/client/Maestro/Resources/configuration-nexio.json
@@ -12,7 +12,7 @@
   "source": {
     "$type": "NEXIOSource",
     "local": {
-      "address": "ws://10.10.1.28:8080/services/nexio"
+      "address": "ws://10.10.1.28/services/nexio"
     },
     "remote": {
       "address": "ftp://10.10.1.55:2098",
diff --git a/client/Maestro/Resources/installforge-installer-project.ifp b/client/Maestro/Resources/installforge-installer-project.ifp
new file mode 100644
index 00000000..a64b33d3
Binary files /dev/null and b/client/Maestro/Resources/installforge-installer-project.ifp differ
diff --git a/client/Maestro/Resources/mc_logo.ico b/client/Maestro/Resources/mc_logo.ico
deleted file mode 100644
index c4c365a4..00000000
Binary files a/client/Maestro/Resources/mc_logo.ico and /dev/null differ