first get
more coding and debug
Merge branch 'master' into develop

Conflicts:
	package.json
	server.js
npm scripts already search ./node_modules/.bin first