debug
Merge branch 'master' of https://github.com/joymaker2014/actnow.git
修改Bug