Merge branch 'master' of https://github.com/shengaooo/GaoDaShang.git

Conflicts:
	src/logintest/CoreServlet.java
Apply Hibernate
Merge remote-tracking branch 'origin/master'