Update voucher to R+ and GSN
Merge remote-tracking branch 'origin/master'

Conflicts:
	themes/riderplus/views/site/_shopnow_popup.php