Merge pull request #285 from pandamicro/master

Refactor #3370: refactor resizeWithBrowserSize to _resizeWithBrowserSize
Merge pull request #287 from pandamicro/master

Remove a small mistake in header