development branch
Merge branch 'master' into development
pluggable support, removed native mongodb support