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

Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: af8c4b8d97
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



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

src/timerd/timermanager.cpp

@@ -42,7 +42,7 @@
 
 #include "debug.h"
 #include "timermanager.h"
-
+#include <system/set_threadname.h>
 
 extern bool timeset;
 time_t timer_minutes;
@@ -89,6 +89,7 @@ void* CTimerManager::timerThread(void *arg)
 	pthread_mutex_t dummy_mutex = PTHREAD_MUTEX_INITIALIZER;
 	pthread_cond_t dummy_cond = PTHREAD_COND_INITIALIZER;
 	struct timespec wait;
+	set_threadname("n:timermanager");
 
 	CTimerManager *timerManager = (CTimerManager*) arg;