--added mongoid
Merge branch 'hotfix/bug1.0'