Merge branch 'design' of github.com:calf-studio-gear/calf into design