企业管理
Merge branches 'dev' and 'dev' of https://github.com/avocadocn/mean into dev

Conflicts:
	public/js/controllers/company.js