Added the support for hls in flash
Merge remote-tracking branch 'origin/jsonConfig' into jsonConfig