修改配置
Merge branch 'master' of https://github.com/zswang/jhtmls

Conflicts:
	bower.json
	dist/jhtmls.min.js.map
	package.json