Change nib files to be Xcode 4.6 compatible
Merge remote-tracking branch 'origin/master'