added mongoid
Merge branch 'mongoid' into dev