Fixing build issue
Merge branch 'master' of https://github.com/rhomobile/rhodes