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