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

Correct errors showing up in demo.siteos.modules page call - final merge I hope