updated for local videoJS
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
rudimentary game view support
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser