api useage error
typo
Merge pull request #1292 from ShengxiangChen/issue_audioEngine

api useage error
Closed #3332: When the page's visible is false, all sounds should be paused
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss3332_PauseSounds

Conflicts:
	CocosDenshion/SimpleAudioEngine.js
Closed #3339: Add WebGL render mode white list

When user set render mode to default, the system will use WebGL on
browsers that we support well, others will be using canvas mode.
Merge pull request #1293 from dingpinglv/Iss3332_PauseSounds

Closed #3332: When the page's visible is false, all sounds should be paused
Merge pull request #1294 from pandamicro/develop

Closed #3339: Add WebGL render mode white list
Merge pull request #1295 from dingpinglv/DevelopToMaster

Push developer branch to master branch
Closed #3342: UIWidget's container intercept touch event while they shouldn't

Resolved with a simple check before the interception
Merge pull request #1296 from pandamicro/develop

Closed #3342: UIWidget's container intercept touch event while they can't
closed #3348 Fix a bug of LabelBMFont's updateDisplayedOpacity
Merge pull request #1297 from xingsenma/develop_bmf

closed #3348 Fix a bug of LabelBMFont's updateDisplayedOpacity
issue #3251 fix bug for layout
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into develop_eglvew
Merge pull request #1298 from xingsenma/develop_layoutIssue

issue #3251 fix bug for layout
issue #3251 improve code
issue #3251 improve code for cocostudio
Closed #3352: Fixed a WebAudioEngine's bug that it can't turn off the effect's volume.
Merge pull request #1301 from dingpinglv/Iss3352_WebAudioEngineVolume

Closed #3352: Fixed a WebAudioEngine's bug that it can't turn off the effect's volume