fix
fix
Merge branch 'master' into test

Conflicts:
	package.json
	quick-server.js