Update from osm_msos
Merge pull request #7 from OpenSiteMobile/master

Sync with OpenSiteMobile