Merge branch 'v3' into customguireader
Merge branch 'customguireader' of https://github.com/lite3/cocos2d-x into customguireader