Merge pull request cocos2d#6287 from minggo/update-version

update version information

Merge pull request cocos2d#6099 from dumganhar/develop

Fixed copying resource fails in empty-lua-test.

Merge pull request cocos2d#5831 from nutty898/master_nutty_modify_fra…

…mework_modifyname_ui

Rename namespace ui->gui

Merge pull request cocos2d#5821 from CocosRobot/update_cocosfiles_139…

…4819251

[AUTO][ci skip]: updating cocos2dx_files.json

Merge pull request cocos2d#5261 from CocosRobot/updategeneratedsubmod…

…ule_1390816204

[AUTO] : updating submodule reference to latest autogenerated bindings

Merge pull request cocos2d#4988 from dumganhar/develop

If this.ctor was not found, output a log.

Merge pull request cocos2d#4970 from Dhilan007/master_222

update js-test submodule.

Merge pull request cocos2d#4334 from CocosRobot/updategeneratedsubmod…

…ule_1384839802

[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings

Merge pull request cocos2d#3848 from 2youyouo2/master

update armature