Extending the temporary texture cache fix to sprite frame caching as well.
Merge branch 'develop-v3' of github:cocos2d/cocos2d-iphone into develop-v3
Merge branch 'develop-v3' of https://github.com/cocos2d/cocos2d-iphone into develop-v3
Move performance tests. Fix up xcode proejct to compile.
Revert "Fix imports to get the performance tests compiling."

This reverts commit fa57224eb2ae236c6aa734f0f1a8d240f8e982e6.

Conflicts:
	tests/PerformanceTests/cocos2d-ios-PerformanceTests.xcodeproj/project.pbxproj
Fix mac test build by making header paths consistent
Fix mac specific warnings
Remove unused and non-working build schemes