Klarna: Klarna Fee as charged more accurately.
Merge branch 'master' of https://github.com/opencart/opencart
Fixed some typos
A typo
Merge pull request #485 from martynas-wm/master

Klarna Fee fix
Merge pull request #487 from Fogelholk/patch-3

Fixed some typos
Merge pull request #486 from Fogelholk/patch-4

A typo
remove the IE7 7 IE6 junk!
some modification work done