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

Conflicts:
	mediaportal/Core/packages.config
	mediaportal/MediaPortal.Application/PostBuild.bat
	mediaportal/MediaPortal.sln
	mediaportal/MiniDisplayLibrary/packages.config
Merge branch 'master' of https://github.com/hkjensen/MediaPortal-1

Conflicts:
	mediaportal/MediaPortal.Application/PostBuild.bat
	mediaportal/MiniDisplayLibrary/packages.config