FIX: Make CreditCardField use template
Merge pull request #2468 from nedmas/make-creditcardfield-use-template

FIX: Make CreditCardField use template