Merge remote-tracking branch 'origin/master'

Conflicts:
	Oink WooCommerce Integration Guide.pdf
Merge branch 'master' of https://github.com/VirtualPiggyInc/oink_woocommerce