devise and mongoid
Merge remote-tracking branch 'origin/mongoid'