Changes payment schema to use integers instead of decimals.
Updates amazon payment for changes to payment module.
Fixes bug causing csv system to skip last line.
Merge remote-tracking branch 'upstream/dev' into dev

Conflicts:
	crm/include/payment/payment.inc.php