Merge pull request #1295 from dingpinglv/DevelopToMaster

Push developer branch to master branch
Merge remote-tracking branch 'cocos2d/master' into develop