Update mongoid.yaml
Merge branch 'develop'