fix for

https://github.com/opencart/opencart/pull/1431
Merge branch 'master' of https://github.com/opencart/opencart
added a api user page
more api work done
https://github.com/opencart/opencart/issues/1454
https://github.com/opencart/opencart/issues/1439
https://github.com/opencart/opencart/issues/1439
Merge pull request #1459 from Martynas-P/master

Added blocking calls to the File driver.
Remove stray s from td tag
more api work done
Merge pull request #1460 from thesjg/patch-1

Remove stray s from td tag
typo
typo
typo
Merge pull request #1465 from MarketInSG/patch-5

word typo
api work done
update
fixes installation crashes on step 3

Deleted extra 'u'
Merge pull request #1468 from Dvir-Julius/patch-3

fixes installation crashes on step 3
Merge branch 'master' of https://github.com/opencart/opencart