Merge branch 'development' of https://github.com/TUB-Control/PaPI into development

Conflicts:
	papi/gui/gui_main.py
	papi/testcfg.xml

fix in gui/manager due to wrong plugin identifier