update
Merge branch 'master' of https://github.com/bbkedu/yog-osprey

Conflicts:
	package.json
删除xml配置，enable mock.