updates
Merge branch 'master' of github.com:foxydot/clamp

Conflicts:
	wp-content/plugins/s2member-pro/includes/classes/gateways/google/google-jwt.inc.php