Merge remote-tracking branch 'upstream/master'

Conflicts:
	MonoGame
	cocos2d/denshion/CCSimpleAudioEngine.cs
Merge branch 'master' of https://github.com/lordnedox/cocos2d-xna