Merge remote-tracking branch 'check/cst-next'

Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)



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

lib/sectionsdclient/sectionsdMsg.h

@@ -101,6 +101,7 @@ struct sectionsd
 		int epg_extendedcache;
 //		std::string network_ntpserver;
 //		std::string epg_dir;
+		int epg_save_frequently;
 	};
 
 };

lib/sectionsdclient/sectionsdclient.cpp

@@ -215,6 +215,7 @@ void CSectionsdClient::setConfig(const epg_config config)
 	msg->network_ntprefresh	= config.network_ntprefresh;
 	msg->network_ntpenable	= config.network_ntpenable;
 	msg->epg_extendedcache	= config.epg_extendedcache;
+	msg->epg_save_frequently= config.epg_save_frequently;
 //	config.network_ntpserver:
 	strcpy(&pData[sizeof(sectionsd::commandSetConfig)], config.network_ntpserver.c_str());
 //	config.epg_dir:

lib/sectionsdclient/sectionsdclient.h

@@ -171,6 +171,7 @@ class CSectionsdClient : private CBasicClient
 		int network_ntpenable;
 		int epg_extendedcache;
 		std::string network_ntpserver;
+		int epg_save_frequently;
 		std::string epg_dir;
 	} epg_config;