Some git repair
Merge branch 'master' of http://github.com/Klein-Graphics/simplicte-main

Conflicts:
	core/libraries/gateway_drivers/Paypal_EC.php