...
Merge branch 'master' of github.com:strangerstudios/pmpro-woocommerce

Conflicts:
	readme.txt