Continued on mongo.py
Merge branch 'mongodb-integration' into development
Merge branch 'team-module' into development