move setDisplayStats function
Merge pull request #48 from chuanweizhang2013/v3luaruntime

V3luaruntime
fixed release error
Merge pull request #49 from chuanweizhang2013/v3luaruntime

fixed release error
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
modify version num
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
Merge pull request #50 from chuanweizhang2013/v3luaruntime

modify version num
Add support keep screen on when is debug
Merge pull request #51 from chuanweizhang2013/v3luaruntime

Add support keep screen on when is debug
Merge pull request #7421 from darkdukey/fix_setup_script

Fix setup.py can't resolve symlink
Merge pull request #7379 from joshuastray/v3

move JumoTo's copy constuctor and operator= to private
return correct language type
Merge pull request #7422 from minggo/get-curent-language

return correct language type
Fix the bug that UITextField doesn't support TTF font
3D:Sprite3D -> Node:Sprite3D
Merge pull request #7425 from minggo/change-test-case-name

3D:Sprite3D -> Node:Sprite3D
[FIX]: When getting the string value, check which textfield is in use
[FIX]: when setting the string value, change both textfields.
Adjust the dependencies between modules on android.
Adjust the dependencies of cocosbuilder & cocostudio on android.