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.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
issue #3162: deprecated RGBAProtocol, NodeRGBA and LayerRGBA
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
issue #3162: reset submodule
issue #3162: change js/cocos2dx.ini
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
issue #3162: reset submodule
issue #3162: change log to cpp file
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
issue #3162: fix test title
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD

Conflicts:
	cocos/2d/CCLabel.cpp
	cocos/2d/CCLabel.h
	cocos/2d/CCLabelBMFont.cpp
	cocos/2d/CCLabelBMFont.h
	cocos/2d/CCLayer.cpp
	cocos/2d/CCLayer.h
	cocos/2d/CCNode.cpp
	extensions/GUI/CCControlExtension/CCControl.cpp
	extensions/GUI/CCControlExtension/CCControlButton.cpp
	extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
	tools/tojs/cocos2dx.ini
Merge pull request #4447 from boyu0/bug3162_opacity_incorrect

Bug #3162: Merge Node and NodeRGBA, fix opacity incorrect bug.