Fixed name error
Merge pull request #2462 from VisualSJ/develop-lineHeight

Fixed name error
Issue #2416: correct some mistakes, let tests running.
Merge branch 'Iss2416_RefactorRenderer' of https://github.com/dingpinglv/cocos2d-html5 into Iss2416_RefactorRenderer