changePassword.jsp导航
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork
参加活动按钮
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork

Conflicts:
	JNUSocialNetwork/WebContent/pages/styles/custom.css
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork