adjusting sets
Merge branch 'master_inc'
adding sangoma ring, and adding features to DRK