Update from osm_cgi-bin repo
Merge pull request #1 from OpenSiteMobile/master

Update from osm_cgi-bin repo