Revert "Remove content scale from bitmap font label as it was causing labels to be way too far down"

This reverts commit 00faacd [formerly 7372707].


Former-commit-id: 7aab4e9

Author: jjxtra

cocos2d/CCLabelBMFont.m

@@ -815,7 +815,7 @@ -(void) createFontChars
 		// See issue 1343. cast( signed short + unsigned integer ) == unsigned integer (sign is lost!)
 		NSInteger yOffset = _configuration->_commonHeight - fontDef.yOffset;
 		CGPoint fontPos = ccp( (CGFloat)nextFontPositionX + fontDef.xOffset + fontDef.rect.size.width*0.5f + kerningAmount,
-							  (CGFloat)nextFontPositionY + yOffset - rect.size.height*0.5f );
+							  (CGFloat)nextFontPositionY + yOffset - rect.size.height*0.5f * __ccContentScaleFactor );
 		fontChar.position = ccpMult(fontPos, contentScale);
 
 		// update kerning