Update from osm_msos
Update from osm_hello
Merge pull request #5 from OpenSiteMobile/master

Sync with OpenSiteMobile repo