添加错误页面其他动画
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
activityCommunity.jsp
circle.js
navRightHome.jsp
navRightProfile.jsp
custom.css
navRightHome.jsp
navRightProfile.jsp
circle.js 下拉无资料卡
一键报名页面UI完成
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork

Conflicts:
	JNUSocialNetwork/WebContent/pages/js/reminding-bell.js
	JNUSocialNetwork/src/service/CommunityService.java
slight modified
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork
Merge branch 'scottDev'