cocos2d/cocos2d-js — pull request #707 by dingpinglv (2014-08-15 06:31:00+00:00)
Title: Sync master branch to develop 

Sync master branch to develop