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