Merge pull request #2 from xiaojue/master

合并代码
修改package.json 缩进
Merge branch 'master' of https://github.com/xiaojue/jbcms into xiaojue-master

Conflicts:
	package.json
更改代码缩进
Merge pull request #4 from junyuecao/master

修改代码缩进