Merge branch 'master' of https://github.com/MediaPortal/MediaPortal-1
Merge branch 'master' of https://github.com/hkjensen/MediaPortal-1
Unhide folder.jpg
Import movie.id