UPDATE
update
update
Merge remote-tracking branch 'origin/master'

Conflicts:
	DLib.iml
	bin/DLib.swc
	src/org/mangui/basic/Player.as
	src/org/mangui/chromeless/ChromelessPlayer.as
	src/org/mangui/chromeless/JSURLStream.as
	src/org/mangui/hls/HLS.as
	src/org/mangui/hls/HLSSettings.as
	src/org/mangui/hls/constant/HLSMaxLevelCappingMode.as
	src/org/mangui/hls/constant/HLSPlayStates.as
	src/org/mangui/hls/constant/HLSSeekMode.as
	src/org/mangui/hls/constant/HLSSeekStates.as
	src/org/mangui/hls/constant/HLSTypes.as
	src/org/mangui/hls/demux/AACDemuxer.as
	src/org/mangui/hls/demux/AVCC.as
	src/org/mangui/hls/demux/AudioFrame.as
	src/org/mangui/hls/demux/Demuxer.as
	src/org/mangui/hls/demux/ExpGolomb.as
	src/org/mangui/hls/demux/ID3.as
	src/org/mangui/hls/demux/MP3Demuxer.as
	src/org/mangui/hls/demux/Nalu.as
	src/org/mangui/hls/demux/PES.as
	src/org/mangui/hls/demux/SPSInfo.as
	src/org/mangui/hls/demux/TSDemuxer.as
	src/org/mangui/hls/demux/VideoFrame.as
	src/org/mangui/hls/event/HLSError.as
	src/org/mangui/hls/event/HLSEvent.as
	src/org/mangui/hls/event/HLSLoadMetrics.as
	src/org/mangui/hls/event/HLSMediatime.as
	src/org/mangui/hls/event/HLSPlayMetrics.as
	src/org/mangui/hls/flv/FLVTag.as
	src/org/mangui/hls/model/AudioTrack.as
	src/org/mangui/hls/model/Fragment.as
	src/org/mangui/hls/model/FragmentData.as
	src/org/mangui/hls/model/FragmentMetrics.as
	src/org/mangui/hls/model/Level.as
	src/org/mangui/hls/playlist/AltAudioTrack.as
	src/org/mangui/hls/playlist/DataUri.as
	src/org/mangui/hls/playlist/Manifest.as
	src/org/mangui/hls/playlist/ManifestLoader.as
	src/org/mangui/hls/stream/AudioTrackController.as
	src/org/mangui/hls/stream/AutoBufferManager.as
	src/org/mangui/hls/stream/AutoLevelManager.as
	src/org/mangui/hls/stream/FragmentLoader.as
	src/org/mangui/hls/stream/HLSNetStream.as
	src/org/mangui/hls/stream/HLSNetStreamClient.as
	src/org/mangui/hls/utils/AES.as
	src/org/mangui/hls/utils/FastAESKey.as
	src/org/mangui/hls/utils/Hex.as
	src/org/mangui/hls/utils/Log.as
	src/org/mangui/hls/utils/PTS.as
	src/org/mangui/hls/utils/Params2Settings.as
	src/org/mangui/hls/utils/ScaleVideo.as