Cascade slide ball's opacity and the Slider's
Also cascade the colours
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
fixed crash cause by incorrect font name.
fix LabelAtlas constructor to CC_CONSTRUCTOR_ACCESS
use CC_CONSTRUCTOR_ACCESS in ParallaxNode
protected -> CC_CONSTRUCTOR_ACCESS
Merge branch 'v3-newaudio' of D:\github_repository\cocosNew into v3
reuse file utils when resolving video path (ios)
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
add

SpriteFrameCache::addSpriteFramesWithFileContent()
SpriteFrameCache::removeSpriteFramesFromFileContent()
add

SpriteFrameCache::addSpriteFramesWithFileContent()
SpriteFrameCache::removeSpriteFramesFromFileContent()
spaces
fix LabelTTF::getBoundingBox() position error
code tidy
tab to spaces
Split luabindings module to some independent modules
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module

Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module

Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	tools/tolua/cocos2dx.ini