merge
Merge branch 'master' of https://github.com/moshenglei/cityandroid
fxi
Merge branch 'master' of https://github.com/moshenglei/cityandroid