Merge branch 'master' into more-animation-and-timing
define background ring sets in configuration
Merge branch 'more-animation-and-timing'