cocos2d/cocos2d-js — pull request #898 by dingpinglv (2014-10-24 03:35:03+00:00)
Title: Merge develop to master branch

Merge develop to master branch