Updated wholesale database integration
Merge remote-tracking branch 'origin/release-dev' into release-dev

Conflicts:
	wp-content/themes/flourpot/custom/wholesale-order.php