show uploading file in play scene
fix potential problem
remove inner function from header file
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3
fix build error
Merge pull request #14 from bofeng-song/v3

show uploading file in play scene
fixed android degbug
Merge pull request #23 from chuanweizhang2013/v3luaruntime

fixed android degbug
add java nativeIsDebug
Merge pull request #24 from chuanweizhang2013/v3luaruntime

add java nativeIsDebug
Merge pull request #6825 from cocoscodeide/v3

[ci skip] update template project lua