update
Merge branch 'master' of https://github.com/0hao/weDevTools

Conflicts:
	app/views/index.html
	package.json
	public/page_debug1f5859.css
	routes/routes.js
	server.js
	static/src1f5859.js
static