update: 调整项目配置
Merge branch 'master' of github.com:changkong/dz7tdf-cm

Conflicts:
	bower.json