Feature #3515: Code implementation done, test on Android fail
Merge pull request #10 from cocos2d/develop

Pull down
Merge branch 'develop' of https://github.com/pandamicro/cocos2d-html5 into develop
Merge pull request #1367 from pandamicro/develop

Feature #3515: EqualToWindow/ProportionToWindow implementation done, test on Android fail