Merge branch 'master' into scottDev
社区活动创建添加截图大概完成，尚未完成测试！
Merge branch 'master' into scottDev

Conflicts:
	JNUSocialNetwork/WebContent/pages/js/activityCre.js
Merge branch 'master' into scottDev
添加hidden field
Merge branch 'master' into scottDev
activityshow.jsp 添加了截图html，处理代码尚未添加~！