merge dev branch, mainly related to Mongo connection updates
Merge branch 'master' into dev