修改bug，新增功能改动
Merge branch 'master' of https://github.com/Foboy/GoGoTown
修改bug