issue #5255:Remove Sprite3D effect test
fixed ui header file include problem
Merge pull request #6868 from andyque/fixInclude

fixed ui header file include problem
adding guard for the callback condition
Merge pull request #6869 from visiblelight/texturecache

adding guard for the callback condition in `TextureCache::addImageAsyncCallBack`
Merge pull request #6867 from samuele3hu/v3_fix

close #5255:Remove Sprite3D effect test
Move `setSearchPat` operation from cpp to script
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
Merge pull request #6870 from samuele3hu/v3_fix

Move `setSearchPath` operation from cpp to script for lua-tests
[AUTO]: updating luabinding automatically
Feature #4977: Add new classes to android mk
Merge pull request #6873 from CocosRobot/update_lua_bindings_1400746052

[AUTO]: updating luabinding automatically
Merge pull request #37 from pandamicro/AssetManager

Feature #4977: Add new classes to android mk
Make constructors public
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into AssetManager
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into lua-vm
Feature #4977: Improve AssetsManager test case
Reverse (Make constructors public)
Feature #4977: Add connection timeout, remove usage of thread for batchDownload
Merge branch 'lua-vm' of https://github.com/dumganhar/cocos2d-x into AssetManager