Merge pull request #1295 from dingpinglv/DevelopToMaster

Push developer branch to master branch
Merge pull request #4 from cocos2d/develop

Merge from trunk
Merge pull request #5 from cocos2d/develop

Merge from trunk
Fix a bug : localStorage in privacy option

Fix a bug that LocalStorage in privacy option can not catch the exception . My solution depends on http://stackoverflow.com/questions/14555347/html5-localstorage-error-with-safari-quota-exceeded-err-dom-exception-22-an
Merge pull request #1340 from WanderWang/develop

Fix a bug on Privacy Option
Merge pull request #1342 from pandamicro/develop

Fixed #3461 : Fix patch to CCLabelTTF
Update Sys.js
Fixed #1339: always go through glBindTexture2D to ensure consistent cache
Merge pull request #1343 from WanderWang/develop

Fix a crash when browser in Privacy Option
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss3411_HideRectorigin
Merge pull request #1344 from dingpinglv/Iss1339_glBindTexture2D

Fixed #1339:always go through glBindTexture2D to ensure consistent cache
Merge pull request #1345 from pandamicro/develop

Fixed #3461 : Resolve bug with duplicated line change
issue #1758: changed draw_nodes to shape_nodes.
Merge pull request #1348 from linshun/develop

issue #1758: changed draw_nodes to shape_nodes.
Closed #3476: The bug of cc.LabelBMFont has been fixed that multi-line is incorrect.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss3476_LabelBMFontMultiLine
Closed #3476: modify "draw_nodes" to "shape_nodes"
Merge pull request #1349 from dingpinglv/Iss3476_LabelBMFontMultiLine

Closed #3476: The bug of cc.LabelBMFont has been fixed that multi-line is incorrect.
Merge pull request #1351 from pandamicro/develop

Fixed #3461 : Modify the solution to improve the performance and the compatibility with chinese caracters
Merge pull request #1352 from pandamicro/develop

Fixed #3461 : Reverse the check to exec version