Merge remote-tracking branch 'refs/remotes/MonoGame/develop3d' into develop3d

Conflicts:
	MonoGame.Framework.Content.Pipeline/MonoGame.Framework.Content.Pipeline.Windows.csproj
	MonoGame.Framework/Graphics/Shader/ConstantBuffer.cs
	MonoGame.Framework/MonoGame.Framework.WindowsPhone.csproj
	MonoGame.Framework/iOS/GamerServices/Guide.cs
	MonoGame.Framework/iOS/iOSGameView.cs
	ThirdParty/Libs
Merge remote-tracking branch 'refs/remotes/origin/develop3d' into develop3d

Conflicts:
	MonoGame.Framework/Content/ContentExtensions.cs
	MonoGame.Framework/DisplayOrientation.cs
	MonoGame.Framework/Windows8/XamlGame.cs
	MonoGame.Framework/WindowsPhone/WPGamePlatform.cs
	MonoGame.Framework/WindowsPhone/WPGameWindow.cs
	MonoGame.Framework/WindowsPhone/XamlGame.cs
	MonoGame.Framework/iOS/OrientationConverter.cs
	ProjectTemplates/VisualStudio2012/WindowsPhone/GamePage.xaml.cs
	ProjectTemplates/VisualStudio2012/WindowsStoreXaml/App.xaml.cs
	ProjectTemplates/VisualStudio2012/WindowsStoreXaml/GamePage.xaml.cs