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 #8 from cocos2d/develop

Pull down
Fixed #3461 : Rewrite the logic of _updateString in CCLabelTTF
fixed #3371: correct a mistake for PointConst
Merge pull request #1336 from linshun/develop

issue #1758: separated misc folder to render texture, motion streak and clipping nodes.
Merge pull request #1337 from dingpinglv/Iss3371_xxxConst

fixed #3371: correct a mistake for PointConst
Merge pull request #1335 from pandamicro/develop

Fixed #3461 : Rewrite the logic of _updateString in CCLabelTTF
Merge pull request #9 from cocos2d/develop

pull down
Merge pull request #5 from cocos2d/develop

Merge from trunk
Fixed #3461 : Fix patch to CCLabelTTF
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
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
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