Merge branch 'develop' into develop.datacontract

Conflicts:
	MonoGame.Framework/MonoGame.Framework.Ouya.csproj
	MonoGame.Framework/MonoGame.Framework.WindowsGL.csproj