Merge branch 'master' of https://github.com/rhomobile/rhodes into neworm_dev
Merge branch 'neworm_dev' of https://github.com/rhomobile/rhodes into neworm_dev1