Merge branch 'master' of https://github.com/creatovisguru/NodeShellApp

Conflicts:
	package.json
	src/public/router.js
	src/public/web-config/app.js
	src/public/web-config/main.js
Merge branch 'master' of https://github.com/creatovisguru/NodeShellApp