Update upload/system/engine/loader.php
session change to avoid an error on some systems
Merge branch 'master' of https://github.com/opencart/opencart
robot empty fix
upgrade blacklist ip fix
Display actual file and line number where the sql error is occured.

Make a change to display actual file and line number where the sql error is occured.
When there is a sql error it will also display model file name where the error is occured.
Merge pull request #366 from jimymodi/master

Display actual file and line number where the sql error is occured.
removed // from the redirect in the upgrade script
updated the upgrade script and language class
language no longer exists when a file can not be found.
Merge pull request #367 from martynas-wm/master

Klarna module fixes
Merge pull request #369 from martynas-wm/master

Klarna Invoice Fee
custom field update
more custom field work done
more custom field work done and big fix for the dashboard stats
Update upload/catalog/controller/common/seo_url.php

// rmove any empty arrays from trailing /
Merge pull request #375 from laanlabs/patch-1

Update upload/catalog/controller/common/seo_url.php
fix for product tag
Merge branch 'master' of https://github.com/opencart/opencart
Update upload/catalog/controller/account/order.php

Fix - when option type is "image", product added to cart without this option when "Reorder" button clicked in order history.