Merge branch 'release/a1'
Merge branch 'develop'
Bead colors should not be unique
Merge branch 'hotfix/dupes'