Merge remote-tracking branch 'oe_21/master' into vuplus-3.0

Merge remote-tracking branch 'oe_21/master' into vuplus-3.0

Conflicts:
	meta-bsp/common/recipes/linux/linux-vuplus_3.13.5.bb
	meta-openvuplus/recipes-core/meta/distro-feed-configs.bbappend
	meta-openvuplus/recipes-core/tasks/task-core-boot.bb
	meta-openvuplus/recipes-devtools/python/python-native_2.7.2.bbappend
	meta-openvuplus/recipes-devtools/swig/swig_2.0.4.bb
	meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
	meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.1.bb
	meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb
	meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb
	meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.inc