Updating xcode project.
Updating substitutions and adding CPP defines for directory locations.
Merge remote-tracking branch 'bindle/pu' into pu