Merge pull request #44 from vinkobuble/develop

POPS-259 When translation goes wrong :)
null check in carrier name in footer
Merge branch 'develop' of https://github.com/mjm0therway/pre-order-broadleaf-repositor into develop
Fixes for duplicate entry.
Removed system out
POPS-266  removed meals/passenger with no meal selected from confirmation email
Merge branch 'develop' of github.com:mjm0therway/pre-order-broadleaf-repositor into develop