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
在admin模型中实现角色修改函数,构建部分测试
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/controllers/manage/admins_controller.rb
	app/models/manage/admin.rb
	app/views/manage/admins/_form.html.erb
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
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
Merge branch 'dev' of github.com:filow/cxlab into dev
学院专业设置