Merge branch 'master' of https://github.com/OpenPLi/openpli-oe-core Conflicts: meta-vuplus meta-xtrend [DH] meta-openpli/recipes-openpli/enigma2-channelsettings/hans.inc [DH] meta-openpli/recipes-openpli/fakelocale/files/lctimelocales.tar.gz...