conflict resolution and Merge remote-tracking branch 'upstream/develop3d' into develop3d

Conflicts:
	Installers/Windows/MonoGame.nsi
	MonoGame.Framework/MonoGame.Framework.Android.csproj
	MonoGame.Framework/MonoGame.Framework.Linux.csproj
	MonoGame.Framework/MonoGame.Framework.MacOS.csproj
	MonoGame.Framework/MonoGame.Framework.Windows.csproj
	MonoGame.Framework/MonoGame.Framework.iOS.csproj
	ProjectTemplates/VisualStudio2012/WindowsPhone/Application.csproj
	README.md
	ThirdParty/Lidgren.Network/Lidgren.Network.iOS.csproj
Fix bug using several blend modes at same time on PSVITA.
Merge remote-tracking branch 'upstream/develop3d' into develop3d
Merge pull request #1230 from jalf/develop3d

FIX: Using several BlendModes in PSVita
WIP audio converting.
Merge branch 'develop3d' of https://github.com/mono/MonoGame into pipeline
PCM->PCM SoundEffect processing and writing is now working.  ADPCM is not yet working.
Made the friendly names of the processors consistent.
Merge pull request #1232 from slygamer/pipeline

[ContentPipeline] PCM->PCM sound effect processing and writing
Merge remote-tracking branch 'upstream/develop3d' into develop3d

Conflicts:
	MonoGame.Framework/MonoGame.Framework.Windows.csproj
Merge branch 'develop3d' of https://github.com/totallyeviljake/MonoGame into develop3d

Conflicts:
	MonoGame.Framework/MonoGame.Framework.Android.csproj
	MonoGame.Framework/MonoGame.Framework.Linux.csproj