Merge pull request #1 from cocos2d/develop

merge the latest develop
#291 fixed
Merge pull request #306 from longyangxi/dev329

#291 fixed