Add Bloom, remove Glow.
Deserialize CCEffects.
Fix content size in Effect node and render texture.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-iphone into develop
revert CCRenderTexture change.
revert RenderTexture.
fix effect test names.
revert effect node change.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-iphone into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-iphone into develop

Conflicts:
	cocos2d-osx.xcodeproj/project.pbxproj
Remove kinetic nodes from kinetic update if its registered as such.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-iphone into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-iphone into develop
fixup project’s missing files.
Support deserialization of Effectws.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-iphone into develop

Conflicts:
	cocos2d-osx.xcodeproj/project.pbxproj
CCEffectRenderer - Fix build warning

GLKMatrix4Invert() takes bool not BOOL as its final argument.
Merge remote-tracking branch 'upstream/develop' into develop
CCEffectColorChannelOffset - Initial commit
CCEffectColorChannelOffset - First pass at the implementation

The basics are working though alpha isn't handled yet. This also adds a test to CCEffectsTest.