Update use of NSNumberFormatter.
Merge branch 'master' into collection-view
Remove unused class.