Merge branch 'neworm_dev' of https://github.com/rhomobile/rhodes into neworm_fix_ruby
Fixing ruby specs
Resolving conflicts