modified the public file UI
Merge branch 'master' of github.com:qqfish/haijiao
ok
Conflicts:
	src/java/com/haijiao/global/Converter.java
	web/teacherIndex.jsp