Merge branch 'development' into LTS_development

# Conflicts:
#	src/input/input_buffer.cpp
#	src/output/output_ts_base.cpp

src/input/input.h

@@ -21,7 +21,7 @@ namespace Mist {
     public:
       Input(Util::Config * cfg);
       virtual int run();
-      virtual void onCrash();
+      virtual void onCrash(){}
       virtual int boot(int argc, char * argv[]);
       virtual ~Input() {};