Merge branch 'origin/next'

Conflicts:
	companion/src/apppreferencesdialog.cpp
	companion/src/apppreferencesdialog.h
	companion/src/apppreferencesdialog.ui
	companion/src/fwpreferencesdialog.ui
	companion/src/imgpreferences.ui
	companion/src/mainwindow.cpp
Splash Editor modified
Timer modes support in Companion
CFN-param alignments
Merge branch 'driver33/PL_Translation' into next
Merge pull request #655 from opentx/driver33/PL_Translation

adding new things from changes
Simulator always asked for calibration
Merge branch 'bsongis/Issue592_sticky_switches' of https://github.com/opentx/opentx into bsongis/Issue592_sticky_switches
Trims included in simulator stick labels
Merge pull request #621 from opentx/bsongis/Issue554_trims_relative_default

All good!
Editor getting some functionality
Merge branch 'origin/next'

Conflicts:
	companion/src/translations/companion_pl.ts
Updated translation
Issue #592 - Stay logical switches function added. Range also prepared
to avoid another EEPROM change in a future release.
Stay function added in Companion
Issue #662 fixed - Companion copy/paste bug
AUTOSWITCH enabled with Stay function
Delay not applicable on Stay logical switches
Problem with AdjustGVAR modes on ARM boards (mode has > 2bits, allowing
more modes if needed later)
Merge branch 'bsongis/Issue592_sticky_switches' into next

Conflicts:
	radio/src/gui/menu_model.cpp