Fix up tests for MacOSX
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-iphone into develop

Conflicts:
	cocos2d-ui-tests/tests/CCEffectsTest.m
Fix Rendering texture vertical orientation error.
update cocos2d project with effects.
Added new methods to support contentScale when creating a CCTexture from CGImageRef. See issue #860
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-iphone into develop
Merge pull request #839 from jtwigg/develop

Fix tests for OSX
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-iphone into develop