Updates from osm_hello
Merge pull request #7 from OpenSiteMobile/master

Updates from osm_hello