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

Conflicts:
	src/system/helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 14473245e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)



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

src/system/helpers.h

@@ -150,6 +150,7 @@ bool split_config_string(const std::string &str, std::map<std::string,std::strin
 
 std::string getJFFS2MountPoint(int mtdPos);
 std::string Lang2ISO639_1(std::string& lang);
+std::string readLink(std::string lnk);
 
 //NI
 int getpidof(const char *process);