Adapted calculation of string's height in iOS 6
Merge remote-tracking branch 'origin/develop' into develop