Project rearrangements
Merge branch 'master' of https://github.com/cocos2d/cocos2d-iphone-ext