Merge pull request #2360 from tiantian20007/backToUpsteram

fix syntax error;
Update AUTHORS
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x