Merge remote-tracking branch 'origin/master'

Conflicts:
	FileLoader.h
	System.h
	qml/Workbench/TaskBar.qml
Merge remote-tracking branch 'origin/master'

Conflicts:
	System.h