closed #4569:Texture2D support for update partial texture
Merge pull request #6019 from Dhilan007/develop_label

closed #4569:Texture2D support for update partial texture
Update CHANGELOG [ci skip]
[AUTO]: updating luabinding automatically
closed #4494::Easy to sets texture parameters of label's cache textures.
Add tools/bindings-generator & tools/tolua into the  lua project template.
Merge pull request #6027 from CocosRobot/update_lua_bindings_1395905692

[AUTO]: updating luabinding automatically
Merge pull request #6028 from Dhilan007/develop_label

closed #4494:: Easier for set texture parameters of label's cache textures.
[AUTO]: updating luabinding automatically
Update CHANGELOG [ci skip]
Merge pull request #6030 from CocosRobot/update_lua_bindings_1395909772

[AUTO]: updating luabinding automatically
Merge pull request #6029 from natural-law/develop

Add tools/bindings-generator & tools/tolua into the  lua template.
Merge remote-tracking branch 'upstream/develop' into develop