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

Conflicts:
	QtCppSample/QtCppSample.pro
	QtCppSample/qml/Test_Sample.qml
	build-QtCppSample/Makefile
	build-QtCppSample/Makefile.Debug
	build-QtCppSample/Makefile.Release
	build-QtCppSample/object_script.QtCppSample.Debug
	build-QtCppSample/object_script.QtCppSample.Release