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

Conflicts:
	public/js/controllers/company.js
增加企业管理页面