Merge remote-tracking branch 'remotes/upstream/master'
Merge branch 'master' of https://github.com/mono/cocos2d-xna
Replace Ouya UUID with xxxxxx