Merge from main version

For some reason it keeps breaking cards.csv at the Animal Companion line
at every merge