[3rd-party feeds] Update.
[GigaBlue] update initrd.bin
Requires new Bootloader to make use of it. Old Bootloader simply ignores those files.
[GigaBlue] update initrd.bin - 2nd
add missing updated gb800seplus.conf and gb800ueplus.conf
[libcheader] fix fix_kernel_build_xargs 3.9.7 build on newer build server
update recipes-distros opendroid
[3rd-party feeds] Update.
[xtrend] et8k and et10k update drivers 17.6.2014

* update ci drivers
[3rdparty]  renome enigma2-plugin-systemplugins-lcnscanner then other disto need this add to privat 3rdparty
[octagon] update feed
[swf] fix typo
[swf] fix generate nfo
[blackbox] update flash size
[blackbox] update flash for oem build
Update enigma2-plugin-skins-mynovumhd2.bb

update to v2.1
openvix: build 012
[3rd-party feeds] Update.
Merge remote-tracking branch 'alliance/2.2' into 2.2

* alliance/2.2:
  [3rd-party feeds] Update.
  openvix: build 012
  Update enigma2-plugin-skins-mynovumhd2.bb
  [blackbox] update flash for oem build
  [blackbox] update flash size
  [swf] fix generate nfo
  [swf] fix typo
  [octagon] update feed
  [3rdparty]  renome enigma2-plugin-systemplugins-lcnscanner then other disto need this add to privat 3rdparty
  [xtrend] et8k and et10k update drivers 17.6.2014
  [3rd-party feeds] Update.
  update recipes-distros opendroid
  [libcheader] fix fix_kernel_build_xargs 3.9.7 build on newer build server
  [GigaBlue] update initrd.bin - 2nd add missing updated gb800seplus.conf and gb800ueplus.conf
  [GigaBlue] update initrd.bin Requires new Bootloader to make use of it. Old Bootloader simply ignores those files.
  [3rd-party feeds] Update.

Conflicts:
	meta-brands/meta-blackbox/conf/machine/include/blackbox-oem.inc
	meta-brands/meta-gigablue/conf/machine/gb800seplus.conf
	meta-brands/meta-gigablue/conf/machine/gb800ueplus.conf
	meta-brands/meta-gigablue/conf/machine/gbquad.conf
	meta-brands/meta-gigablue/conf/machine/gbquadplus.conf
	meta-brands/meta-gigablue/recipes-cfe/gigablue-initrd-gb800seplus.bb
	meta-brands/meta-gigablue/recipes-cfe/gigablue-initrd-gb800ueplus.bb
	meta-brands/meta-gigablue/recipes-cfe/gigablue-initrd-gbquad.bb
	meta-brands/meta-gigablue/recipes-cfe/gigablue-initrd-gbquadplus.bb
	meta-brands/meta-gigablue/recipes-cfe/gigablue-initrd.inc
	meta-brands/meta-xtrend/recipes-drivers/et-dvb-modules-et10000.bb
	meta-brands/meta-xtrend/recipes-drivers/et-dvb-modules-et8000.bb
	meta-oe/conf/distro/atemio.conf
	meta-oe/conf/distro/octagon.conf
	meta-oe/conf/distro/swf.conf
	meta-oe/recipes-distros/opendroid/image/opendroid-enigma2.bb
	meta-oe/recipes-distros/swf/image/swf-image.bb
	meta-oe/recipes-oe-alliance/enigma2-plugins/enigma2-3rdparty-plugins.bb