diff --git a/react-app/.idea/workspace.xml b/react-app/.idea/workspace.xml
index 2bf2c2d6c3..40fd98b0f0 100644
--- a/react-app/.idea/workspace.xml
+++ b/react-app/.idea/workspace.xml
@@ -26,18 +26,18 @@
       <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="288">
+            <state relative-caret-position="153">
               <caret line="50" column="60" selection-start-line="50" selection-start-column="44" selection-end-line="50" selection-end-column="60" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="helloworld.js" pinned="false" current-in-tab="false">
+      <file leaf-file-name="helloworld.js" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/helloworld.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="90">
-              <caret line="15" column="6" selection-start-line="15" selection-start-column="6" selection-end-line="15" selection-end-column="6" />
+            <state relative-caret-position="30">
+              <caret line="2" column="62" selection-start-line="2" selection-start-column="62" selection-end-line="2" selection-end-column="62" />
               <folding />
             </state>
           </provider>
@@ -56,18 +56,18 @@
       <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/webcomponents/file-upload/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="255">
-              <caret line="17" column="11" selection-start-line="17" selection-start-column="11" selection-end-line="17" selection-end-column="11" />
+            <state relative-caret-position="45">
+              <caret line="3" column="17" selection-start-line="3" selection-start-column="16" selection-end-line="3" selection-end-column="17" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="file-upload.html" pinned="false" current-in-tab="true">
+      <file leaf-file-name="file-upload.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/webcomponents/file-upload/file-upload.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="146">
-              <caret line="101" column="47" selection-start-line="101" selection-start-column="47" selection-end-line="101" selection-end-column="47" />
+            <state relative-caret-position="91">
+              <caret line="367" column="72" selection-start-line="367" selection-start-column="71" selection-end-line="367" selection-end-column="72" />
               <folding />
             </state>
           </provider>
@@ -97,8 +97,8 @@
         <option value="$PROJECT_DIR$/webcomponents/alfresco-file-list/src/alfresco-file-list.html" />
         <option value="$PROJECT_DIR$/index.html" />
         <option value="$PROJECT_DIR$/css/style.html" />
-        <option value="$PROJECT_DIR$/src/helloworld.js" />
         <option value="$PROJECT_DIR$/webcomponents/file-upload/file-upload.html" />
+        <option value="$PROJECT_DIR$/src/helloworld.js" />
       </list>
     </option>
   </component>
@@ -259,7 +259,7 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="js-jscs-nodeInterpreter" value="/usr/local/bin/node" />
     <property name="list.type.of.created.stylesheet" value="CSS" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../demo-shell-ng2" />
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
@@ -681,12 +681,12 @@
       <updated>1459937301294</updated>
       <workItem from="1459937303527" duration="16595000" />
       <workItem from="1459961481615" duration="247000" />
-      <workItem from="1460028311714" duration="4775000" />
+      <workItem from="1460028311714" duration="5476000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="21617000" />
+    <option name="totallyTimeSpent" value="22318000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="23" width="1440" height="803" extended-state="6" />
@@ -915,25 +915,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/webcomponents/file-upload/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="17" column="11" selection-start-line="17" selection-start-column="11" selection-end-line="17" selection-end-column="11" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/helloworld.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="15" column="6" selection-start-line="15" selection-start-column="6" selection-end-line="15" selection-end-column="6" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="288">
+        <state relative-caret-position="153">
           <caret line="50" column="60" selection-start-line="50" selection-start-column="44" selection-end-line="50" selection-end-column="60" />
           <folding />
         </state>
@@ -941,8 +925,24 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/webcomponents/file-upload/file-upload.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="146">
-          <caret line="101" column="47" selection-start-line="101" selection-start-column="47" selection-end-line="101" selection-end-column="47" />
+        <state relative-caret-position="91">
+          <caret line="367" column="72" selection-start-line="367" selection-start-column="71" selection-end-line="367" selection-end-column="72" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/webcomponents/file-upload/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" column="17" selection-start-line="3" selection-start-column="16" selection-end-line="3" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/helloworld.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="62" selection-start-line="2" selection-start-column="62" selection-end-line="2" selection-end-column="62" />
           <folding />
         </state>
       </provider>
diff --git a/react-app/build/helloworld.js b/react-app/build/helloworld.js
index 7b7679ccf7..75711a22ea 100644
--- a/react-app/build/helloworld.js
+++ b/react-app/build/helloworld.js
@@ -2,7 +2,7 @@ var CommentBox = React.createClass({
     displayName: 'CommentBox',
 
     getInitialState: function () {
-        return { accept: 'image/*', action: 'http://192.168.99.100:8080/alfresco/service/api/upload', droppable: '' };
+        return { accept: 'image/*', action: 'http://localhost:8888/alfresco/service/api/upload', droppable: '' };
     },
 
     onChangeAccept: function (e) {
diff --git a/react-app/src/helloworld.js b/react-app/src/helloworld.js
index 095aea1670..a39c5d3425 100644
--- a/react-app/src/helloworld.js
+++ b/react-app/src/helloworld.js
@@ -1,6 +1,6 @@
 var CommentBox = React.createClass({
     getInitialState: function() {
-    return { accept: 'image/*', action: 'http://192.168.99.100:8080/alfresco/service/api/upload', droppable: ''};
+    return { accept: 'image/*', action: 'http://localhost:8888/alfresco/service/api/upload', droppable: ''};
     },
 
     onChangeAccept: function(e) {