Revert "Revert 66158c4..e508879"

This reverts commit fd8adcb729f03e027d32d16356835295c8922c1e.

Conflicts:

FlappyBird.spritebuilder/Source/libs/cocos2d-iphone/cocos2d-ios.xcodepro
j