shit
shit2
shit3
shit4
shit5
shit6
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