added pathview
Merge remote-tracking branch 'origin/branchA' into branchB

Conflicts:
	PathView/pathview.qml