添加错误页面其他动画
Merge branch 'scottDev'
修复漏洞
修改密码跳转
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork

Conflicts:
	JNUSocialNetwork/WebContent/pages/parts/profileJavaScript.jsp