minor
Merge branch 'master' into feature/object-save-loader

Conflicts:
	src/interface/mainwindow2.cpp