Issue #5688: merge cc.NodeRGBA to cc.Node
Issue #5688: merge cc.LayerRGBA to cc.Node
Issue #5688: merge cc.LayerRGBA to cc.Layer
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into NodeRGBA

Conflicts:
	cocos2d/core/base-nodes/CCNode.js
	cocos2d/core/sprites/CCSprite.js
Merge pull request #1973 from VisualSJ/NodeRGBA

merge cc.NodeRGBA and cc.LayerRGBA to cc.Node