第七次代码提交，基本完成js
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/dao/dao/impl/UserDaoimpl.java
	src/web/servlet/LoginServlet.java
	src/web/servlet/RegisterServlet.java