Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/hkjensen/MediaPortal-1

Conflicts:
	mediaportal/MediaPortal.Base/scripts/MovieInfo/IMDB.csscript
	mediaportal/MediaPortal.Base/scripts/MovieInfo/IMDB_MP13x.csscript