修改组件数据结构
Merge branch 'dev' of https://github.com/avocadocn/mean into dev

Conflicts:
	app/models/user.js
	public/js/controllers/company.js