Merge branch 'development' into LTS_development

# Conflicts:
#	src/controller/controller.cpp

src/output/output.cpp

@@ -96,6 +96,9 @@ namespace Mist {
   /// thus causing the process to exit cleanly.
   void Output::onFail(){
     isInitialized = false;
+    wantRequest = true;
+    parseData= false;
+    streamName.clear();
     myConn.close();
   }