Merge branch 'develop' of github.com:flow-stack/flow into develop

* 'develop' of github.com:flow-stack/flow:
  starts nginx in windows