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

Conflicts:
	src/gui/epgplus.cpp


Origin commit data
------------------
Commit: 429d510ef1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)

src/gui/epgplus.cpp

@@ -243,6 +243,7 @@ void EpgPlus::TimeLine::paintMark(time_t _startTime, int pduration, int px, int
 	// paint new mark
 	CProgressBar pbbar = CProgressBar(px, this->y + this->font->getHeight(), pwidth, this->font->getHeight());
 	//NI pbbar.setActiveColor(COL_MENUCONTENTSELECTED_PLUS_0);
+	pbbar.setType(CProgressBar::PB_TIMESCALE);
 
 	time_t currentTime;
 	time(&currentTime);