add new features for map and fix bug
Merge branch 'master' of https://github.com/qianshui/qianshui.git