modified:   src/control/joiss/ControlManager.cpp
	modified:   src/control/stream/RealMediaObj.cpp
	modified:   src/control/stream/StreamManager.cpp
	modified:   src/control/stream/VodMediaObj.cpp
	modified:   src/core/j_common.h
	modified:   src/core/x_asio.cpp
	modified:   src/core/x_http.cpp
	modified:   src/files/josf/JofsFileReader.cpp
	modified:   src/host/hik/HikStream.cpp
	modified:   src/host/jos/JoStream.cpp
	modified:   src/host/samsung/SamsungStream.cpp
	modified:   src/host/sony/SonyStream.cpp
Merge branch 'master' of https://github.com/joorhy/jorhy-prj