EventAPI.js about.js actvity.js community.js function.js function.js
people.js 跳转标签
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork
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/activityCommunity.jsp
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork
synchronized
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork
roll back