Merge branch 'development' into LTS_development

# Conflicts:
#	src/output/output_progressive_mp4.cpp

src/output/output_http_internal.cpp

@@ -619,6 +619,9 @@ namespace Mist {
       }
       std::string response;
       std::string rURL = H.url;
+      if(method != "OPTIONS" && method != "HEAD"){
+        initialize();
+      }
       H.Clean();
       H.SetHeader("Server", "MistServer/" PACKAGE_VERSION);
       H.setCORSHeaders();
@@ -632,7 +635,6 @@ namespace Mist {
         H.Clean();
         return;
       }
-      initialize();
       response = "// Generating info code for stream " + streamName + "\n\nif (!mistvideo){var mistvideo = {};}\n";
       JSON::Value json_resp = getStatusJSON(reqHost, useragent);
       if (rURL.substr(0, 6) != "/json_"){

src/output/output_progressive_mp4.cpp

@@ -227,7 +227,6 @@ namespace Mist{
         elstBox.setMediaRateFraction(1, 0);
       }else{
         elstBox.setCount(1);
-
         elstBox.setSegmentDuration(0, tDuration);
         elstBox.setMediaTime(0, 0);
         elstBox.setMediaRateInteger(0, 1);