Merge branch 'develop' of https://github.com/cocos2d/cocos2d-iphone into develop
Merge branch 'develop' of https://github.com/cocojoe/cocos2d-iphone into develop