添加机构的控制器
Merge remote-tracking branch 'github/master'

Conflicts:
	app/controllers/systemmanage/Department.scala
	conf/routes
"Merge branch 'master' of /common/hooxin/Work/scala/techsupport_ext4_scala with conflicts.