#281 fixed
#249 fixed
Merge pull request #297 from longyangxi/master

#249 bug fixed
Merge pull request #1 from cocos2d/develop

merge the latest develop