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

Sync with OpenSiteMobile
Merge pull request #8 from OpenSiteMobile2/master

Update from master