Merge pull request #2 from cocos2d/develop

update cc2dx/develop
remove the redundant check

ccbreader can load file without the owner setting
Merge pull request #5305 from hbbalfred/develop

close #2128: remove the redundant check when load a file in ccbreader.