some changes

Signed-off-by: OEtzi007 <DavidSchmidt314@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/userinterface/MainWindow.cpp


Signed-off-by: OEtzi007 <DavidSchmidt314@gmail.com>