cocos2d/cocos2d-js — pull request #779 by dingpinglv (2014-09-11 03:15:11+00:00)
Title: Merge develop to master branch

Merge develop to master branch