f
g
added internationalisation
added credit card stuff
Merge remote-tracking branch 'origin/master'