Erster Schritt um PQ's automatisch zu importieren
Merge branch 'master' of https://github.com/Ging-Buh/cbserver

Conflicts:
	CB_Server/.settings/com.vaadin.integration.eclipse.prefs
	CB_Server/WebContent/VAADIN/widgetsets/cb_server.widgetset.Cb_serverWidgetset/cb_server.widgetset.Cb_serverWidgetset.devmode.js
	CB_Server/WebContent/VAADIN/widgetsets/cb_server.widgetset.Cb_serverWidgetset/cb_server.widgetset.Cb_serverWidgetset.nocache.js
	CB_Server/WebContent/VAADIN/widgetsets/cb_server.widgetset.Cb_serverWidgetset/compilation-mappings.txt
Merge branch 'master' of https://github.com/Ging-Buh/cbserver
Merge branch 'master' of https://github.com/Ging-Buh/cbserver
Merge branch 'master' of https://github.com/Ging-Buh/cbserver
Search for IPv4 Addresses in Networkadapters for showing in Setting - QR-Code