Some amendment on credit card
Merge branch 'master' of https://github.com/matiboy/compargo
Merge branch 'master' of https://github.com/matiboy/compargo

Conflicts:
	templates/beez_20/javascript/controllers/credit-card.js