1. 修正合图崩溃bug。
Merge branch 'v3_dll' of https://github.com/chengstory/cocos2d-x into v3_dll