no message
Feature #4977: Fix an issue about checkUpdate function
Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager

Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/platform/CCFileUtils.cpp
	tests/lua-tests/project/CMakeLists.txt
	tests/lua-tests/project/Classes/AppDelegate.cpp
	tests/lua-tests/project/proj.android/jni/Android.mk
	tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
Modify Xcode project’s configure
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager

Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
	tests/lua-tests/src/AssetsManagerTest/AssetsManagerTest.lua
	tests/lua-tests/src/mainMenu.lua
Merge pull request #8717 from MSOpenTech/wp8-dll

New version of WP8 for cocos2d-x v3.3
[AUTO][ci skip]: updating cocos2dx_files.json
[ci skip]update config.json
Update the related AssetsManagerEx files and related project configure
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager

nter
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Update the CCFileUtils.h
Merge pull request #8719 from CocosRobot/update_cocosfiles_1413423316

[AUTO][ci skip]: updating cocos2dx_files.json
Merge pull request #8722 from samuele3hu/v3_assetsmanager

Add AssetsmanagerEx and adjust related project configure and files