合并部分js
Merge pull request #13 from lemonz-/master

合并部分js修改new-activity.php
Merge pull request #7 from lohuvie/master

merge