Merge branch 'master' into AudioSettings

tried to merge all conflicts from master game settings track and audio settings track. Likely to have messed up the aesthetics of the game settings+ some references in inspector but hopefully these are not needed