First attempt.
Merge branch 'master' into localize-errors

Conflicts:
	classes/class-s4wc_gateway.php
	classes/class-s4wc_subscriptions_gateway.php
fix merge conflicts
Localize errors Fixes #34

Sorry for the delay, I think this should fix the localization problem.
Merge branch 'localize-errors'