Updated xcodeproj to recommended settings; fixing Animation enum issues.
Merge branch 'upstream' into kreeger