Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ccx_filesystem
jsbidings for mac
Merge branch 'develop' into js_mac
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ccx_filesystem
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ccx_filesystem
issue #2334, Update the SDK of ND91 to newest version.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
issue #2329: remove unneeded codes
issue #2329:not bind CCFileUtils private function
Set textview_hidden to true on init
Merge branch 'develop' into js_mac
fix sub ccb node resource root path bug

When load sub ccb type node , create a new ccbreader from parent
ccbreader. Should copy ccbRootPath from parent, otherwise, load
resource will fail if sub ccb node resource use special path
Merge pull request #3008 from minggo/ccx_filesystem

remove unneeded codes when using assets manager
closed #2334, Add user login & logout functions in plugin nd91.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge pull request #3013 from hawkwood/develop

closed #2337: EditBox doesn't show any text in TestJavascript/ExtensionsTest/EditBoxTest.
The hidden property of UITextField is always NO when it's initialized but the keyboard is not opened.
We should set hidden property to YES right after it's initialized.
Update AUTHORS [ci skip]
Merge pull request #3015 from natural-law/develop

closed #2334: Add user login & logout functions in plugin nd91.
Merge pull request #3014 from wtyqm/develop

close #2338: fix sub ccb node resource root path bug
Update AUTHORS [ci skip]