Merge remote-tracking branch 'origin/dewb' into game-logic-events
Xcode made a few adjustments to the project file which seem to be relatively harmless