Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Conflicts:
	src/driver/rcinput.cpp
	src/gui/audioplayer.cpp
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a58f2cc447
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)



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

lib/jsoncpp/jsoncpp.cpp

@@ -1455,6 +1455,7 @@ bool OurReader::readToken(Token& token) {
     ok = readStringSingleQuote();
     break;
     } // else continue
+    /* is a break missing here? or is this correct? */
   case '/':
     token.type_ = tokenComment;
     ok = readComment();