minor updates
Merge branch 'development' of https://github.com/OFFIS-Automation/Framework into development

Conflicts:
	modules/automation/projects/RemoteLolecServer/src/main.cpp