Add xxtea encrypt support for lua and update the console submodule
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix

Conflicts:
	tools/cocos2d-console
update console submodule
Update setting for different platform
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
Adjust the xxtea directory structure and modify some grammar expressions
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
Adjust the xxtea directory structure and modify configs files for platforms
Update Linux CMakeLists for xxtea
update libcurl.a
Merge pull request #6977 from minggo/update-version

update libcurl.a
[AUTO]: updating luabinding automatically
[ci skip]
Merge pull request #6978 from CocosRobot/update_lua_bindings_1401937200

[AUTO]: updating luabinding automatically
Merge pull request #6955 from samuele3hu/v3_fix

Add xxtea encrypt support for lua and update the console submodule
[ci skip]
[AUTO][ci skip]: updating cocos2dx_files.json
Merge pull request #6980 from CocosRobot/update_cocosfiles_1401940273

[AUTO][ci skip]: updating cocos2dx_files.json
Update controller.lua for lua-tests and bindings-generator submoudle
Replace `log` with `CCLOG`