fix
Merge branch 'orm_js' of https://github.com/rhomobile/rhodes into orm_js