Update from osm_demo
Merge pull request #14 from OpenSiteMobile/master

Update from osm_demo