添加了比赛大类
优化了添加学院/专业的功能，提高了操作的效率
Merge branch 'dev' of github.com:filow/cxlab into dev

Conflicts:
	app/controllers/manage/professions_controller.rb
	app/models/manage/admin.rb
	app/views/manage/professions/index.html.erb
	config/routes.rb