issue #3192 fixed some bug for cocostudio reader
Merge pull request #1254 from xingsenma/cocostuodio_reader

issue #3192 fixed some bug for cocostudio reader
Fixed bug that CCControl send action by all types of event.
issue #3251 Fixed bug of armature that it display wrong when set content scale.
Merge pull request #1258 from HoGarfield/CCControlEvent

Fixed bug that CCControl send action by all types of event.
Issue #2829: fixed a bug of WebAudioEngine that it's effect can't stop/pause when the effect didn't preload.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2829_ImproveAudioCompatibility
Merge pull request #1259 from dingpinglv/Iss2829_ImproveAudioCompatibility

Issue #2829: fixed a bug of WebAudioEngine that it's effect can't stop/pause when the effect didn't preload.
Merge pull request #1260 from ShengxiangChen/issue_addSpriteFramesWithJson

add json support to SpriteFrameCache
closed #3256: Fixed a bug of CCActionInterval that it will error when target have not own RGBAProtocol.
Merge pull request #1261 from xingsenma/develop_action

closed #3256: Fixed a bug of CCActionInterval that it will error when target have not own RGBAProtocol.
fixed SpriteFramceCache's bug that parsing a wrong Rotated value to SpriteFrame
Merge pull request #1262 from dingpinglv/Iss_AddJsonSupport

fixed SpriteFramceCache's bug that parsing a wrong Rotated value to SpriteFrame
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into issue_addSpriteFramesWithJson

Conflicts:
	cocos2d/sprite_nodes/CCSpriteFrameCache.js