-More NONE fixes
-Fix error on no favourites.xml
revert to hopefully merge easier
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser.XBMC