Auto-merge of Xcode 5 xib files

Nils Hayat bumped into something interesting while merging code:

Git had just auto-merged a xib file for me!…It turns out that the xib files generated by Xcode 5 are of a completely new kind. It seems that Apple started from scratch with this and the changes make xib files finally usable in teams of all sizes for the first time.