POPS-266
POPS-266, POPS-271, POPS-265, POPS-325
Merge branch 'develop' of github.com:mjm0therway/pre-order-broadleaf-repositor into develop

Conflicts:
	site/src/main/resources/emailTemplates/orderConfirmation-email.html
Merge pull request #41 from vinkobuble/develop

POPS-265 POPS-266 POPS-271 POPS-325