Fix for merge.
Fix for merge.
Merge branch 'master' of https://github.com/dankrusi/ExtPlane-Panel

Conflicts:
	dialogs/settingsdialog.cpp
	dialogs/settingsdialog.ui