Added a start script
Updated with OpenShift deployment
Using Openshift environment variables in the server startup
Merge branch 'master' into develop

Conflicts:
	.travis.yml
	package.json
Merge branch 'develop' into feature/user