Merge pull request #9 from cocos2d/develop

pull down
Fixed #3461 : Fix patch to CCLabelTTF
Merge pull request #1340 from WanderWang/develop

Fix a bug on Privacy Option
Fixed #3461 : Change to real class static properties

_measureCanvas and _measureCtx now is real class static properties,
then can be accessed with cc.LabelTTF._measureCanvas
Merge pull request #1342 from pandamicro/develop

Fixed #3461 : Fix patch to CCLabelTTF
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
Fixed #3461 : Resolve bug with duplicated line change
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.
Fixed #3461 : Modify the solution to improve the performance and the compatibility with chinese caracters
Fixed #3461 : Note
Fixed #3461 : use search for forward check