cocos2d/cocos2d-html5 — pull request #1801 by dingpinglv (2014-04-24 07:09:27+00:00)
Title: Closed #4926: fixed some bugs and merge develop 3.0 to develop branch

1. added a condition to check plist file in SpriteFrameCache addSpriteFrames
2. added a condition to support playing sound from 'file://' origin
3. merged develop 3.0 to develop branch