Merge remote-tracking branch 'origin/huntercen' into dev

Conflicts:
	.classpath
更新
Merge branch 'canlee' of https://github.com/matrixj/student.git into canlee
Merge remote-tracking branch 'origin/dev' into canlee
1、添加了数据库表teacher_subject的外键
2、增加了实体类
1、 不知道更新了什么
Merge remote-tracking branch 'origin/dev' into linyaohua

Conflicts:
	.classpath
	WebContent/WEB-INF/web.xml
	src/com/student/repository/TeacherMessageControler.java
1、更新合并
1、更新下成绩类，添加了任课老师属性
1、忽略
1、忽略
Merge remote-tracking branch 'origin/canlee' into huntercen
Merge remote-tracking branch 'origin/dev' into huntercen