closed #4070, Add method to reload cached texture & update the nodes used the texture.
closed #4070, Solve the compile error on android.
Merge branch 'master' into issue4070
closed #4070, Remove the method CCTextureCache::updateTexture().
Modify method of changing color and opacity
Merge branch 'master' into master_nutty_modify_framework_for315
Modify namespace from "gui" to "ui"
Add custom widget and reader
Merge branch 'master' into master_nutty_modify_framework_for315
Update the reference of submodule "plugin".
Merge pull request #5540 from natural-law/master

Update the reference of submodule "plugin".
Merge branch 'master' into master_nutty_modify_framework_for315
Add rich text
Fixed bug of bmfont
Remove richtext temply
Fixed build error
fix:fix two bug
Modify mk files
Fixed bug of sample
close #4285:The setFrameEventCallFunc and setMovementEventCallFunc of CCArmature called at the same time in lua script would lead to crash