Merge branch 'fix-1022'

Restore the Xcode rules to the Objective-C template as per the discussion
thread on 5bd4330. Although the rules correspond to an IDE and so are
global, most users of the Obj-C template expect to find the Xcode rules
in the template generated by github.com, since the IDE is so ubiquitous.

This could possibly be resolved by adding a template transclusion
mechanism in the future, but for now duplication is the way to go.

diff --cc Global/Xcode.gitignore
index 3dad88c94b78cf50279a53b18c6a4b7df9c4474b,309867992142ace3fda6d4f1c087901a60845585..3a130f18c55102d93a06c81ad1776bf81d681449
--- 1/Global/Xcode.gitignore
--- 2/Global/Xcode.gitignore
+++ b/Global/Xcode.gitignore
@@@ -9,7 -9,6 +9,5 @@@ build
  !default.perspectivev3
  xcuserdata
  *.xccheckout
 -profile
  *.moved-aside
  DerivedData
- *.hmap
- *.ipa