more work done
sql update including the custom field location table
started fixing the manual order
Update failure.php

Fixes typos in error message for checkout failure.
Merge pull request #1191 from DS-Matt/master

Update failure.php
Fixed PayPal's transaction search.
Merge pull request #1192 from martynas-wm/master

Fixed PayPal's transaction search.
Update to coding standards - converted many space indented files to tabs
More tab indent conversions
fix for order editor when klarna is selected
end tag missed
fix for

https://github.com/opencart/opencart/issues/372
quick fix for last commit and order_id
Merge remote-tracking branch 'upstream/master'