去掉额外字段
Merge branch 'dev' of github.com:filow/cxlab into dev
Merge branch 'dev' of github.com:filow/cxlab into dev
Merge branch 'dev' of github.com:filow/cxlab into dev
合并
Merge branch 'dev' of github.com:filow/cxlab into dev

Conflicts:
	app/models/manage/admin.rb
	app/views/manage/admins/show.html.erb
	app/views/manage/roles/show.html.erb
权限显示优化，更改专业设置显示方式
Merge pull request #5 from MrSummit/dev

权限显示优化，更改专业设置显示方式