updated bootstrap to the 3 rc1 version
klarna url update
Merge branch 'master' of https://github.com/opencart/opencart