corret return value
Merge branch 'develop' of https://github.com/HelloJenkins/cocos2d-x into develop