add member_of property to collections and concepts in mappers
Merge branch 'master' into private_frontend