synchronize SG branch with master 0c3e840700a, manually updating any files that do not contain SG related changes, and manually removing files that are mistakenly present in SG
merge w/master; resolve merge conflicts from master, fix small change in local lib name used by libs/soundgrid