Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'remotes/upstream/master'
Merge remote-tracking branch 'upstream/master'
Take out Ouya UUID
Replaced id with xxxx of rOuya
Merge branch 'master' of https://github.com/mono/cocos2d-xna
Replace Ouya UUID with xxxxxx
Merge pull request #165 from mono/master

Replace Ouya UUID with xxxxxxx