reverted osm usage
Merge branch 'develop' into gh-pages