劳动用工培训 一览
Merge branch 'master' of github.com:LightCircle/LawyerOnline

Conflicts:
	config/routes.yaml
	views/common_sidemenu.html