master update ver.2.0
Merge branch 'master' into hotfix1

Conflicts:
	TestCpp/src/TestCpp.cpp