typo
typo
Merge branch 'jing-sherwin' of https://github.com/myoung-zynga/cocos2d-html5 into jing-sherwin