分页注释
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
home改版
jq
补缺
微调
微调
寻找朋友
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork

Conflicts:
	JNUSocialNetwork/WebContent/pages/styles/home.css
微调
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork
首页
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork