testing commit
Merge remote-tracking branch 'origin/ClientDevJHK' into ClientDev.BA

Conflicts:
	README.md