Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3
add lock to get file name
show tips while launch app
Merge pull request #29 from bofeng-song/v3

add lock to get file name