Merge branch 'development' into LTS_development

# Conflicts:
#	src/output/output_hls.cpp

src/output/output_hls.cpp

@@ -348,7 +348,7 @@ namespace Mist {
     }
     
     if (H.url.find("hls") == std::string::npos){
-      myConn.close();
+      onFail();
       return;
     }
 
@@ -366,6 +366,7 @@ namespace Mist {
     initialize();
 
     if (!keepGoing()){
+      onFail();
       return;
     }