Merge pull request #1413 from Martynas-P/master

Added Amazon Payments.
Making a tiny change to see line ending committed correctly.
added a api folder for adding orders from the admin
Merge branch 'master' of https://github.com/opencart/opencart

Conflicts:
	upload/catalog/controller/api/order.php
	upload/catalog/controller/module/cart.php
	upload/catalog/language/english/api/manual.php
Added First Data payment gateway options.
cart merge fix
Merge branch 'master' of https://github.com/opencart/opencart
Whitespace standardization in catalog controller
Merge pull request #1416 from opencarthelp/master

Whitespace standardization in catalog controller
Added new sagepay payment modules.
Removed exit statement from start-up when class not found to allow for unit tests to execute properly. This won't change the exit of the app if file not found.
Whitespace standardization in /system
Added tests to master. Unable to merge test-suite branch due to white spaces being removed and conflicts.
Added tests folder.
Added default language fix (Thanks to @DS-Matt) REF: #1405
Merge pull request #1418 from opencarthelp/master

Whitespace standardization in /system
Further changes to white space and also indents.
Merge branch 'master' of https://github.com/opencart/opencart
more api work done
Merge branch 'master' of https://github.com/opencart/opencart