Merge pull request #1366 from dingpinglv/Iss3501_ReleaseV2.2.2

Issue #3501: update Authors and Changelog.txt for releasing v2.2.2
Merge pull request #1367 from pandamicro/develop

Feature #3515: EqualToWindow/ProportionToWindow implementation done, test on Android fail
Issue #3501: update submodule reference
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss3501_ReleaseV2.2.2
Merge pull request #1368 from dingpinglv/Iss3501_ReleaseV2.2.2

Issue #3501: update submodule reference
issue #3419 fix bug of armature that schedule is stop when remove it and add again
Issue #3501: Update submodule's reference
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss3501_ReleaseV2.2.2
Merge pull request #1369 from dingpinglv/Iss3501_ReleaseV2.2.2

Issue #3501: Update submodule's reference
Fixed #3461: Solve a bug that line doesn’t break with ‘\n’ when line is too short
Simplify LabelTTF solution, add lineWidths for measurement
Fixed #3461: Check line break before check line width
Merge pull request #1370 from pandamicro/develop

Fixed #3461: Solve a bug that line doesn’t break with ‘\n’ when line is too short
issue #3419 format space
Merge pull request #1360 from xingsenma/develop_20131218

issue #3419 update cocostudio to 1.2.0.0
Issue #3501: update engine version number
issue #3419 add ".ExportJson" to cc.RESOURCE_TYPE
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into develop_20131218
Merge pull request #9 from cocos2d/develop

Merge from trunk
Update CCArmature.js
Refactor #3370: Remove width of viewport to avoid adaptation problems