Merge remote-tracking branch 'upstream/master'

Conflicts:
	MonoGame
	cocos2d/denshion/CCSimpleAudioEngine.cs
Merge remote-tracking branch 'origin/master'

Conflicts:
	MonoGame