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

Origin commit data
------------------
Branch: ni/coolstream
Commit: a7e4be231c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-24 (Mon, 24 Oct 2016)


------------------
No further description and justification available within origin commit message!

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

src/system/helpers.cpp

@@ -45,6 +45,7 @@
 #include <linux/fs.h>
 #include "debug.h"
 #include <global.h>
+#include <driver/fontrenderer.h>
 #include <system/helpers.h>
 #include <gui/update_ext.h>
 using namespace std;
@@ -1253,6 +1254,7 @@ std::vector<std::string> split(const std::string &s, char delim)
 	return vec;
 }
 
+#if __cplusplus <= 201103L
 std::string to_string(int i)
 {
 	std::stringstream s;
@@ -1294,6 +1296,7 @@ std::string to_string(unsigned long long i)
 	s << i;
 	return s.str();
 }
+#endif
 
 /**
  * C++ version 0.4 std::string style "itoa":