id:791 working on paypal advanced
Merge remote-tracking branch 'remotes/origin/D791' into develop

Conflicts:
	catalog/includes/content/checkout/confirmation.php