check browser
Merge branch 'master' of https://github.com/qqfish/haijiao

Conflicts:
	src/java/hibernate.cfg.xml
	web/teacherIndex.jsp