merge - number shortcuts in software manager's men
merge -Transponder: Try to avoid GSOD when tuners do not reply some parameters
merge - frontend: add QAM256 for DVB-T2
merge - db: parse and store DVB-C system (annex A/C)
merge - frontend: Add DTB03 stick as dib0700 to allow correct SNRdB output
merge - PliExtraInfo: Add ServiceInfo and CryptoInfo types