proper placement of collections under db-objects
Merge remote-tracking branch 'origin/master'

Conflicts:
	mingo.py
proper placement of collections under db-objects