Updated project settings per Xceode's recommendation
Merge commit '912f298'