Merge remote-tracking branch 'upstream/master' into nomodules

readme.md

@@ -1,13 +1,14 @@
 #WRIO local development package
 
 Please refer wiki for local development instructions
+[Local development of WRIO-InternetOS front end](https://github.com/webRunes/WRIO-InternetOS/wiki/Deploy-on-localhost)
 
 # Clone your repositories there
 
-Note: replace "webRunes" in the URLs below to your github name, if you're going to
-work on this fork.
+Note for Windows users: [Python](https://www.python.org/downloads/release/python-2713/) must be installed. Please make sure, python is included in system path.
+Note: Fork and replace "webRunes" in the URLs below with your github name.
 
-If you're going to work on front-end only, first two will be enough
+If you're going to work on front-end only this will be enough
 ```
 git clone https://github.com/webRunes/WRIO-local-dev
 cd WRIO-local-dev
@@ -36,13 +37,24 @@ cd WRIO-InternetOS
 yarn
 npm run devserver
 ```
+Please add following entries to your hosts file
+```
+127.0.0.1 webgold_d.wrioos.com
+127.0.0.1 core_d.wrioos.com
+127.0.0.1 titter_d.wrioos.com
+```
+
 Now each time you start frontend server, run
 ```
 cd WRIO-InternetOS
 npm run devserver
 ```
-note: use ```sudo npm run devserver``` on unix systems
+note: use ```sudo npm run devserver``` on unix systems, on Windows systems run this command from the Administrator user.
 
+Start
+```
+http://localhost/
+```
 
-[Local development of WRIO-InternetOS front end](https://github.com/webRunes/WRIO-InternetOS/wiki/Deploy-on-localhost)  
-[How to setup development process on local machine](https://github.com/webRunes/WRIO-local-dev)
+Port 80 must be available. In case it's not you may need to stop "Web Deployment Agent Service" at "View local services":
+[http://www.ferolen.com/blog/microsoft-httpapi2-0-use-port-80-cannot-start-wamp-apache/](http://www.ferolen.com/blog/microsoft-httpapi2-0-use-port-80-cannot-start-wamp-apache/)