nores
Merge branch 'master' of github.com:SocaDB/SocaDB

Conflicts:
	NOTES.md
	src/SocaDB/DbBootStrap.cpp