after checking the save & close button was not closing.
Merge branch 'develop' of github.com:loadedcommerce/loaded7 into develop
Merge remote-tracking branch 'remotes/origin/B2721' into develop

Conflicts:
	catalog/admin/includes/applications/products/actions/save.php
	catalog/admin/includes/functions/html_output.php