Merge remote-tracking branch 'origin' into 3.3/develop

Worked on simplification of the module.

Conflicts:
	classes/Kohana/PayPal/ExpressCheckout.php
	classes/paypal.php