Merge branch 'develop' of github.com:b108/osm-mobile into develop
Merge branch 'develop' of github.com:b108/osm-mobile