Update to match HelloJS v029
Merge branch 'master' of https://github.com/OpenSiteMobile/mobilesiteos
Update readme, and fix bad merge
Merge pull request #19 from OpenSiteMobile/master

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

Sync with OpenSiteMobile