fixing merge issue
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
added profile and level params for hls