Merge branch 'master' of https://github.com/MediaPortal/MediaPortal-1

Conflicts:
	mediaportal/Configuration/Sections/MovieDatabase.cs
Merge branch 'master' of https://github.com/hkjensen/MediaPortal-1