Merge branch 'develop' of https://github.com/mono/MonoGame into develop.Core

Conflicts:
	MonoGame.Framework/MonoGame.Framework.Windows.csproj

All tested and working fine
Merge branch 'develop.Core' of https://github.com/DDReaper/MonoGame into develop.Core