fixed SpriteFrame.initWithTextureFilename converted (pixel-based) rect to pixels
fixed UnitTest.SpriteFrame.initWithTexture
Update CCScheduler.scheduleCallbackForTarget 's comment

Update CCScheduler.scheduleCallbackForTarget 's comment @example has a mistake
Fixed #2467  Fixed a bug of cc.LabelBMFont that it's very slow when calling setString
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into develop_BMFont
Update CCSAXParser.js

Improve Plist file loading error message to more friendly
Merge pull request #1084 from cschwartz/initWithTextureFilename

fixed SpriteFrame.initWithTextureFilename converted (pixel-based) rect t...
Merge pull request #1085 from WanderWang/develop

Update CCScheduler.scheduleCallbackForTarget 's comment
Merge pull request #1087 from xbruce/develop

Update CCSAXParser.js
Merge pull request #1086 from xingsenma/develop_BMFont

Fixed #2467 Fixed a bug of cc.LabelBMFont that it's very slow when calling setString
fixed #2531 Asynchronous loading resources for rendering classes has been implemented.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2531_AutoLoadResourcesForCCBReader

Conflicts:
	cocos2d/sprite_nodes/CCSprite.js
	cocos2d/sprite_nodes/CCSpriteFrame.js
fixed #2531 Asynchronous loading texture for LabelBMFont on Canvas Mode has been implemented
fixed #2531 use direct calling function of parent class instead this._super
fixed #2531 Async loading textures for cc.LabelBMFont has been implemented.
Merge pull request #1090 from dingpinglv/Iss2531_AsyncLoadingTextures

fixed #2531 Asynchronous loading textures for rendering classes has been implemented
fixed #1089 fixed a bug of cc.LayerColorCanvas that respecting incorrect opacity passed into init method
Merge pull request #1091 from dingpinglv/Iss1089_LayerColorCanvasRespectingOpacity

fixed #1089 fixed a bug of cc.LayerColorCanvas that respecting incorrect opacity passed into init method