Fix for .psd extensions in CCSpriteFrameCache. Added fileLookup.plist lookup.
Merge branch 'v3.1' of https://github.com/sidebolt/cocos2d-iphone into v3.1