修改了编码方式
增加rest接口路径
Merge branch 'master' of https://github.com/jackrain/webpos

Conflicts:
	config/configuration.js
	node_modules/framework/framework.js