Update from osm_hello
Merge pull request #3 from OpenSiteMobile/master

Sync update from osm_hello