Merge pull request #14 from Narcssus/master

	缩进啊缩进啊！！！！
redesign_controller and url
Merge pull request #15 from rw1993/master

redesign_controller and url
重定义活动页面1