rename variable
Merge pull request #5826 from chuanweizhang2013/cmdconsole

console variable init
[ci skip]
modify autotest.py for use mac app.
Update the reference of submodule "cocos2d-console".
Merge pull request #5838 from natural-law/develop

Update the reference of submodule "cocos2d-console".
Merge pull request #5834 from shujunqiao/autotest

modify autotest.py for use mac app.
fixed win32 don't exit
fixed win32 exit
Merge pull request #18 from cocos2d/develop

update cocos2d-x
Merge pull request #1 from chuanweizhang2013/luamerage

Luamerage