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

Conflicts:
	lib/timerdclient/timerdtypes.h
	src/gui/channellist.cpp
	src/system/httptool.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0bb2f888c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)



------------------
This commit was generated by Migit

src/system/locals_intern.h

@@ -1908,6 +1908,7 @@ const char * locale_real_names[] =
 	"moviebrowser.info_recorddate",
 	"moviebrowser.info_serie",
 	"moviebrowser.info_size",
+	"moviebrowser.info_spacer",
 	"moviebrowser.info_title",
 	"moviebrowser.info_videoformat",
 	"moviebrowser.last_play_max_items",
@@ -1958,6 +1959,7 @@ const char * locale_real_names[] =
 	"moviebrowser.short_recorddate",
 	"moviebrowser.short_serie",
 	"moviebrowser.short_size",
+	"moviebrowser.short_spacer",
 	"moviebrowser.short_title",
 	"moviebrowser.start_head",
 	"moviebrowser.start_record_start",
@@ -2340,6 +2342,12 @@ const char * locale_real_names[] =
 	"recordingmenu.vtxt_pid",
 	"recordingmenu.zap_on_announce",
 	"recordtimer.announce",
+	"remotebox_add",
+	"remotebox_channel_na",
+	"remotebox_del",
+	"remotebox_head",
+	"remotebox_ip",
+	"remotebox_mod",
 	"reset_all",
 	"reset_channels",
 	"reset_confirm",
@@ -2616,6 +2624,7 @@ const char * locale_real_names[] =
 	"timerlist.type.nextprogram",
 	"timerlist.type.record",
 	"timerlist.type.remind",
+	"timerlist.type.remotebox",
 	"timerlist.type.shutdown",
 	"timerlist.type.sleeptimer",
 	"timerlist.type.standby",