Merge branch 'development' into LTS_development

# Conflicts:
#	src/controller/controller_statistics.cpp
#	src/input/input_buffer.cpp
#	src/input/input_dtsc.cpp
#	src/input/input_ebml.cpp
#	src/input/input_flv.cpp
#	src/input/input_mp3.cpp
#	src/output/output_httpts.cpp
#	src/output/output_progressive_mp3.cpp
#	src/output/output_progressive_mp4.cpp

src/output/output.cpp

@@ -45,7 +45,7 @@ namespace Mist{
     option["long"] = "noinput";
     option["short"] = "N";
     option["help"] = "Do not start input if not already started";
-    option["value"].append(0ll);
+    option["value"].append(0);
     cfg->addOption("noinput", option);
   }