204 - meal confirm: hide flights that are gone and has no meal selected; remove an old field not needed
fix getcarrier in reminder email
rename the field
carrier... from customer is actually not reliable
Merge branch 'develop' of github.com:mjm0therway/pre-order-broadleaf-repositor into develop

Conflicts:
	site/src/main/resources/emailTemplates/orderConfirmation-email.html