- re-enable front-panel settings for Trinity; re-sort vfd_setup
Merge remote-tracking branch 'cool-cst-next/cst-next'

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/vfd_setup.cpp