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.
re-work ObjectAL access for Android targets and extract weak array access into more idiomatic array containers
add Android platform

abstracts UIKit, GLKit, QuartzCore, AudioToolbox, and AVFoundation references into common accessor points
UITouch references changed to CCTouch container objects
UIEvent references changed to CCTouchEvent container objects
GK types converted to CC types
add abstractions for UI interaction on Android targets

effective changes for UITouch to CCTouch transition and other control interactions
updates to tests reflecting current Android abstracted targets
updates for templates for Android abstracted targets
temporary project to run test harness on Android targets
updates for projects to reflect latest Android target changes
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-iphone into develop
Merge pull request #1 from apportable/develop

Import from Android target additions