Merge attachments in equipment
update for interaction design
Merge branch 'master' into feature/agm-interaction