Fix many master card file errors
Merge remote-tracking branch 'enricob/fix-master-cards'
merging other repos and minor formatting