cocos2d/cocos2d-js — pull request #1091 by pandamicro (2014-11-04 10:39:45+00:00)
Title: Bug fixes

Don't merge yet, Still need to test the functionalities