line endings
Merge branch 'master' of https://github.com/OFFIS-Automation/Framework

Conflicts:
	modules/frontend/projects/AmirFrontend/src/MainWindow.cpp
	modules/olvis3/projects/OlvisExecGuiPlugin/src/VideoDisplay/VideoControlToolbar.ui
	modules/olvis3/projects/OlvisExecGuiPlugin/src/VideoDisplay/VideoWidget.ui
bugfixes for Q_WS_* macros
Merge branch 'master' into claas/feat/TypedRcUnits

Conflicts:
	modules/olvis3/include/core/ProcessorInfo.h
	modules/olvis3/projects/OlvisRcUnit/src/OlvisRcUnit.h
	modules/olvis3/projects/OlvisRcUnit/src/OlvisRcUnitInterface.cpp
	modules/olvis3/projects/OlvisRcUnit/src/OlvisRcUnitInterface.h
	modules/sensorSystem/projects/SensorSystemRcUnit/src/SensorSystemRcUnitInterface.h