1
Merge branch 'master' of https://github.com/roymuste/QMLExample

Conflicts:
	QtCppSample/Test_Sample.qml
	QtCppSample/main.cpp