Merge pull request #1460 from pandamicro/develop

Refactor #3370: Correction of Fixed Height and Fixed Width behavior
Fixed #3501: update reference of submodule
Merge pull request #1461 from dingpinglv/develop

Fixed #3501: update reference of submodule
Refactor #3370: adjust container size more properly
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into develop