updated ORM model to make find more clear/structured
Merge branch 'master' of https://github.com/rhomobile/rhodes