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

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