于强:修复fbottle崩溃
Merge branch 'master' of github.com:yanxin59/CarrotFantasy