Merge pull request #24 from cocos2d/develop

update cocos2d-x
[ci skip], add emptytest.py
update console submodule
Merge pull request #6279 from minggo/update-console

update console submodule
add no-res
Merge branch 'luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into luaruntime
Merge pull request #6280 from chuanweizhang2013/luaruntime

update
Culling working again
compiles on windows
Merge pull request #6281 from ricardoquesada/autoculling_working_ok

Culling working again
[AUTO]: updating luabinding automatically
Merge pull request #6283 from CocosRobot/update_lua_bindings_1397533229

[AUTO]: updating luabinding automatically
closed #4849, The environment variable take effect without reboot machine on windows.
Merge pull request #6284 from natural-law/issue4849

The environment variable take effect without reboot machine on windows
closed #4607: Fixed project created by template crashes on iOS5.1 device.
Renames the protected method: 'EventListener::(s|g)etSceneGraphPriority'
-> 'EventListener::(s|g)etAssociatedNode'
Merge pull request #6285 from dumganhar/template-ios5.1-crash-fix

closed #4607: Fixed project created by template crashes on iOS5.1 device...
Merge pull request #6286 from dumganhar/rename-listener-method

Renames the protected method: 'EventListener::(s|g)etSceneGraphPriority'-> 'EventListener::(s|g)etAssociatedNode'
[ci skip], modify print infomation in emptytest.py
update version information