Merge branch 'development' into LTS_development

# Conflicts:
#	lib/http_parser.cpp

src/output/output_hls.cpp

@@ -1,5 +1,6 @@
 #include "output_hls.h"
 #include <mist/stream.h>
+#include <mist/url.h>
 #include <mist/langcodes.h> /*LTS*/
 #include <unistd.h>
 

src/output/output_http_internal.cpp

@@ -3,6 +3,7 @@
 #include <mist/stream.h>
 #include <mist/encode.h>
 #include <mist/langcodes.h>
+#include <mist/url.h>
 #include "flashPlayer.h"
 #include "oldFlashPlayer.h"
 #include <mist/websocket.h>

src/output/output_httpts.cpp

@@ -4,6 +4,7 @@
 #include <mist/stream.h>
 #include <unistd.h>
 #include <mist/procs.h>
+#include <mist/url.h>
 
 namespace Mist{
   OutHTTPTS::OutHTTPTS(Socket::Connection & conn) : TSOutput(conn){

src/output/output_rtmp.h

@@ -3,6 +3,7 @@
 #include <mist/amf.h>
 #include <mist/rtmpchunks.h>
 #include <mist/http_parser.h>
+#include <mist/url.h>
 
 
 namespace Mist {

src/output/output_rtsp.h

@@ -6,6 +6,7 @@
 #include <mist/rtp.h>
 #include <mist/sdp.h>
 #include <mist/socket.h>
+#include <mist/url.h>
 
 namespace Mist{
   class OutRTSP : public Output{

src/output/output_ts.cpp

@@ -1,6 +1,7 @@
 #include "output_ts.h"
 #include <mist/http_parser.h>
 #include <mist/defines.h>
+#include <mist/url.h>
 
 namespace Mist {
   OutTS::OutTS(Socket::Connection & conn) : TSOutput(conn){