Card & User affiliations refactoring
Merge branch 'affiliations-refactoring'