commit message test
Merge branch 'qa' into Develop

Conflicts:
	HelloCpp.cpp