filloader stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	qml/Workbench/MainWindow.qml