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

Sync update from osm_hello