Merge Xcode5 back into Xcode4
Rename Xcode4 directory to Xcode4+ to reflect XC5 compatibility
Merge branch 'master' into legacy_macros