修改company model
Merge branch 'dev' of https://github.com/avocadocn/mean into dev

Conflicts:
	app/controllers/company.js
Merge branch 'dev' of https://github.com/avocadocn/mean into dev