Update for XCode 5.0 (I skipped Auto-Layout new feature, should still be able to open Layout with XCode 4.x.)
Merge remote-tracking branch 'origin/master'