Revert due to whitespace commenting issue with VIP
Merge branch 'develop'

Conflicts:
	plugins/public-pages/makers.php
Branch conflicts fix
Maker confirmation email updates