User merge
Merge branch 'master' of https://github.com/Lapizistik/osm-explorator
Introduced OSMObject.