merge - cosmetics: whitespace fixes
merge - ChannelSelection: History zap to the previous service after e.g. timerzap
merge - ChannelSelection.py: Do the same for recallPrevService
merge - ChannelSelection: Add current played service not in history to history
merge - servicedvb: fix compiler warning
merge - frontend: use delsys list instead of frontend 'type'
merge - NimManager: implement multi-type tuners based on delsys list
merge - NimManager: add sanitycheck on nim_slot frontend_id
merge - freesatv2: Simplify header and reduce code, resolve compiler warnings
merge - dvb: Make Read-and-strip method more efficient
merge - frontend: add PLP support (DVB-T2)
merge - NimManager: create all applicable config for multi-type frontends
merge - NimManager: avoid leading space in parsed multi_type list
merge - freesatv2.cpp: Faster parsing of data files
merge - freesatv2: Fix that last commit
merge - GraphMultiEPG: Make function of OK button configurable
merge - RecordTimer: isInTimer: keep searching for full event recording
merge - frontend: keep 'simulate' frontend delsys in sync with real frontend
merge - ServiceScan: go to TV mode ensuring finding Last Scanned Bouquet
merge - MovieSelection: Trascan is not really a trashcan when disabled