Get rid of the "possible" future CGFloat extensions for NSString and NSNumber
Indent the source code based on Xcode's indentation feature.
Merge branch 'master' into imageRep