WIP mongoid document editor
Merging master
Merge branch 'master' into mongoid_document_editor
Configuring admin
Merge branch 'master' of github.com:nick-desteffen/risk2210