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

Conflicts:
	MonoGame.Framework/Android/AndroidGameWindow.cs
	MonoGame.Framework/Graphics/GraphicsDevice.OpenGL.cs
	MonoGame.Framework/Graphics/GraphicsDevice.cs
	MonoGame.Framework/Graphics/GraphicsExtensions.cs
	MonoGame.Framework/Graphics/RenderTarget2D.OpenGL.cs
	MonoGame.Framework/Graphics/SpriteFont.cs
	MonoGame.Framework/Graphics/Vertices/IndexBuffer.cs
	MonoGame.Framework/Media/Song.cs
	MonoGame.Framework/Media/Video.IOS.cs
	MonoGame.Framework/Media/VideoPlayer.IOS.cs
	MonoGame.Framework/Properties/AssemblyInfo.cs
	MonoGame.Framework/iOS/GamerServices/Guide.cs
	MonoGame.Framework/iOS/GamerServices/SignedInGamer.cs
Merge branch 'develop_iOS' of https://github.com/n1ckd0r/MonoGame into develop_iOS

Conflicts:
	MonoGame.Framework/Graphics/GraphicsDevice.cs
	MonoGame.Framework/Graphics/SpriteFont.cs
	MonoGame.Framework/Graphics/Vertices/IndexBuffer.cs
	MonoGame.Framework/Media/Song.cs
	MonoGame.Framework/Media/Video.IOS.cs
	MonoGame.Framework/iOS/GamerServices/Guide.cs
	MonoGame.Framework/iOS/GamerServices/SignedInGamer.cs