add pet card to production, merge from master
merge from master
final changes for release 1.2
fix column sizing
fix merge
fix page
fix page