Fixed merge issue
Merge branch 'develop-v3' of github:cocos2d/cocos2d-iphone into develop-v3
Fixing header search paths in the OSX project