test commit
Merge了学良的修改

Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/Java/synergy/controller/LoginController.java
	src/main/webapp/WEB-INF/views/login.jsp