Updating a xib with a more recent version of Xcode.
Merge branch 'master' into lionAndLater