test commit - 1
commit message test
test for conflict
Merge branch 'qa' into Develop

Conflicts:
	HelloCpp.cpp