update

update.
Merge branch 'develop' of https://github.com/shenxiyou/cocos2d-x into develop