phils try at commit
fixed the pbxproj(?)
Merge remote-tracking branch 'origin/master' into HEAD