Update upload/install/view/template/step_2.tpl
gitignore file addition for development
Merge pull request #306 from opencartarab/patch-4

Update upload/install/view/template/step_2.tpl
Merge pull request #307 from hkulekci/opencart

gitignore file addition for development
fix for Logging in as customer when admin records IP
Merge branch 'master' of https://github.com/opencart/opencart
removed customer admin login fix. its not really required.
image tool improvement about scale according to width, height, default
fix for:

ControllerCommonSeoUrl::rewrite() Fatal
Issue #164
fix for Layouts choose the most general route first, instead of the most specific route
added a cross domain cookie setter

removed some js files from the header that should be loaded only when required.

renamed browser files to just browse.

updated the getUrlVar function in js
klarna payment gateway added
klarna sql update
ckeditor update
updated the ckeditor config.js
removed some testing code
Merge pull request #312 from hkulekci/opencart

image tool improvement about scale according to width, height, default
image class update some var names
added klarna fee
Update upload/catalog/language/english/payment/klarna_account.php