修改与调整。
Merge branch 'master' of https://github.com/luomuwen/mapagent