分页注释
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork

Conflicts:
	JNUSocialNetwork/WebContent/pages/js/activityShow.js
邀请好友显示
首页改版
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork

Conflicts:
	JNUSocialNetwork/WebContent/pages/js/activityShow.js
	JNUSocialNetwork/src/service/ImageUploadService.java