Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Conflicts:
	acinclude.m4
	configure.ac
	data/fonts/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	data/webtv/Makefile.am
	data/y-web/Y_Tools_Boxcontrol.yhtm
	data/y-web/Y_Tools_Screenshot.yhtm
	lib/hardware/coolstream/hardware_caps.h
	lib/libtuxtxt/tuxtxt_common.h
	src/gui/audioplayer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/movieplayer.h
	src/gui/network_setup.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: ae4307bc1c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)

data/y-web/images/Makefile.am

@@ -48,6 +48,7 @@ install_DATA =	accept.png \
 		popup.png \
 		properties.png \
 		radio.png \
+		rc_ax_hd51.png \
 		rc_cst_v1.jpg \
 		rc_cst_v2.png \
 		rc_cst_v3.png \
@@ -56,6 +57,7 @@ install_DATA =	accept.png \
 		rc_cst_v6.png \
 		rc_dbox_nokia_old.png \
 		rc_dbox_philips.png \
+		rc_mutant_hd51.png \
 		record.png \
 		reload.png \
 		remove.png \