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

Conflicts:
	MainTest.qml
	Scroll.qml