Merge pull request #13 from lohuvie/master

merge
	modified:   activity.php
	modified:   css/activity.css
	modified:   css/new-activity.css
	modified:   js/jquery.index.js
	modified:   js/jquery.new-activity-pic.js
	modified:   new-activity.php
	images/waiting-pic.gif
Merge pull request #27 from willkan/master

更新了很多。。
asdf
登陆判定 新建活动修改 我要喜欢参与点击
Merge pull request #2 from lohuvie/master

3.18更新