Merge conflics resolved

client/html/index.html

@@ -18,14 +18,14 @@
 
   <script type="text/javascript">
     function loadCanvas(){
-<<<<<<< HEAD
+
       if (window.canvasApp.visible === undefined) {
         window.canvasApp = {
             sessionToken: '',
             executingAt: 'Master App',
             visible: false,
             topMargin: 180,
-            urlPrefix: 'http://localhost:1337/',  /* 'http://localhost:1337/'   */   /*  'https://develop.advancedalgos.net/'  */
+            urlPrefix: 'https://develop.advancedalgos.net/' ,  /* 'http://localhost:1337/'   */   /*  'https://develop.advancedalgos.net/'  */
             graphQL: {
             masterAppApiUrl: 'https://app-api.advancedalgos.net/graphql'
         },
@@ -34,18 +34,6 @@
 
         loadAdvancedAlgosPlatform();
       }
-=======
->>>>>>> 6573ab73822b75454926efa97ec378656b6f0327
-
-      window.canvasApp = {
-          sessionToken: '',
-          executingAt: 'Master App',
-          visible: false,
-          topMargin: 25,
-          urlPrefix: 'https://develop.advancedalgos.net/'  /* 'http://localhost:1337/'   */   /*  'https://develop.advancedalgos.net/'  */
-      };
-
-      loadAdvancedAlgosPlatform();
     }
   </script>
 </head>