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

Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 4ace56d488
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)

src/gui/components/cc_frm_window.cpp

@@ -157,7 +157,7 @@ void CComponentsWindow::initVarWindow(	const int& x_pos, const int& y_pos, const
 	ccw_col_head 	= COL_MENUHEAD_PLUS_0;
 	ccw_col_head_text = COL_MENUHEAD_TEXT;
 	ccw_col_footer	= COL_MENUFOOT_PLUS_0;
-
+	cc_parent = NULL;
 	page_scroll_mode = PG_SCROLL_M_OFF; //permanent disabled here, only in body used!
 
 	initCCWItems();

src/gui/components/cc_item.cpp

@@ -50,6 +50,7 @@ CComponentsItem::CComponentsItem(CComponentsForm* parent)
 	cc_item_selected 	= false;
 	cc_page_number		= 0;
 	cc_has_focus		= true;
+	cc_parent		= NULL;
 	initParent(parent);
 }