Fix to force trailing slashes on urls
fixed woocommerce version compare
Merge