Merge pull request #1374 from pandamicro/develop

Refactor #3370: Resolve bug in simulator readaptation
Fixed #3461: LabelTTF with zero dimension breaks line with hard lien break
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into develop