Bug fixes
Merge branch 'woocomm-and-shopp-fixes' of https://github.com/VirtualPiggyInc/oink_woocommerce into woocomm-and-shopp-fixes