Merge branch 'development' into LTS_development

# Conflicts:
#	CMakeLists.txt
#	src/analysers/info.cpp

CMakeLists.txt

@@ -110,13 +110,10 @@ set(libHeaders
   ${SOURCE_DIR}/lib/bitstream.h
   ${SOURCE_DIR}/lib/checksum.h
   ${SOURCE_DIR}/lib/config.h
-  ${SOURCE_DIR}/lib/converter.h
   ${SOURCE_DIR}/lib/defines.h
   ${SOURCE_DIR}/lib/dtsc.h
   ${SOURCE_DIR}/lib/encryption.h
-  ${SOURCE_DIR}/lib/filesystem.h
   ${SOURCE_DIR}/lib/flv_tag.h
-  ${SOURCE_DIR}/lib/ftp.h
   ${SOURCE_DIR}/lib/http_parser.h
   ${SOURCE_DIR}/lib/json.h
   ${SOURCE_DIR}/lib/mp4_adobe.h
@@ -151,13 +148,10 @@ set(libSources
   ${SOURCE_DIR}/lib/bitfields.cpp
   ${SOURCE_DIR}/lib/bitstream.cpp
   ${SOURCE_DIR}/lib/config.cpp
-  ${SOURCE_DIR}/lib/converter.cpp
   ${SOURCE_DIR}/lib/dtsc.cpp
   ${SOURCE_DIR}/lib/dtscmeta.cpp
   ${SOURCE_DIR}/lib/encryption.cpp
-  ${SOURCE_DIR}/lib/filesystem.cpp
   ${SOURCE_DIR}/lib/flv_tag.cpp
-  ${SOURCE_DIR}/lib/ftp.cpp
   ${SOURCE_DIR}/lib/http_parser.cpp
   ${SOURCE_DIR}/lib/json.cpp
   ${SOURCE_DIR}/lib/mp4_adobe.cpp
@@ -238,16 +232,6 @@ makeAnalyser(OGG ogg)
 makeAnalyser(RTP rtp) #LTS
 makeAnalyser(RTSP rtsp_rtp) #LTS
 makeAnalyser(Stats stats) #LTS
-add_executable(MistInfo
-  src/analysers/info.cpp
-)
-target_link_libraries(MistInfo 
-  mist 
-)
-install( 
-  TARGETS MistInfo 
-  DESTINATION bin
-)
 
 ########################################
 # MistServer - Inputs                  #