beta fixes
Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser