Deploy.
Merge branch 'master' of github.com:rgwsk65/another

Conflicts:
	wp-content/plugins/gift-voucher-page/gift-voucher-page.php
	wp-content/plugins/gift-voucher-page/templates/gift-voucher.php
	wp-content/themes/roots-master/functions.php
	wp-content/themes/roots-master/templates/header-top-navbar.php