fix (font rendering): calculate correct string dimensions

Corrected calculation of string dimensions for rendering
Merge branch 'master' of github.com:rockabyte/cocos2d-x