Merge branch 'lukas'

Conflicts:
	connectionsettings.cpp
	mainwindow.cpp
bracket
Merge branch 'jochen' of https://github.com/devjb/plcanalyzer into jochen
Merge branch 'master' of https://github.com/devjb/plcanalyzer
Merge branch 'jochen'
Merge branch 'lukas'