Merge pull request #1295 from dingpinglv/DevelopToMaster

Push developer branch to master branch
Merge branch 'master_cocos2d-html5' into jandusoft