merge remote from openvix/enigma2 and openatv/enigma2