Configuration Changes and related abstraction changes
Database Configuration interface
Merge remote-tracking branch 'origin/master'

Conflicts:
	KonfDB.sln