公开课分组
Merge remote-tracking branch 'origin/master'

Conflicts:

	TechJudge/src/main/java/com/jsjxjd/controller/OpenClassGroupController.java
	TechJudge/src/main/java/com/jsjxjd/daoImpl/OpenClassGroupDAOImpl.java
	TechJudge/src/main/java/com/jsjxjd/service/OpenClassGroupService.java

	TechJudge/src/main/java/com/jsjxjd/serviceImpl/OpenClassGroupServiceImpl.java
	TechJudge/src/main/webapp/admin/groupmanage.jsp

	TechJudge/target/m2e-wtp/web-resources/META-INF/maven/com.jsjxjd/Demo/pom.properties