issue #3162: Merge Node and NodeRGBA, fix bug: Child's opacity will not be changed when its parent's setCascadeOpacityEnabled was set to true and opacity was changed.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
closed #3162: fix indent.
closed #3162: add RGBAProtocol, NodeRGBA and LayerRGBA back and deprecate them
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
issue #3162: Add layer cascade color and cascade opacity test, fix bugs
issue #3162: delete duplicate functions.
issue #3162: add updateColor function to Label and delete duplicate functions.
add class GridNode
EffectTest can run
Fix EffectTest Crash
Fix EffectAdvancedTest Crash
Fix ArmatureSceneTest Crash
remove setGrid getGrid in class Node
add setGridTarget method, grid node now can affect its target and its child
TransitionPageTurn can work now
other grid scene transitions can work now
Fix project can not compile after rebased pull
remove _grid
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect