Updates to Stryker
Merge with master
updates to stryker
merge with origin
Reverting game mode
Merge branch 'Engleton' into Stryker