Merge pull request #33 from vinkobuble/develop

POPS-190 jenkins deploy to tomcat
POPS-190 jenkins tomcat
Merge branch 'develop' of github.com:mjm0therway/pre-order-broadleaf-repositor into develop
fix cart checkout; a french spelling
fix semicolons in french html
fix meal spelled in confirm email in french
fix confirm email subject for french
add theme stuff
more translations; make multi-tenant theme
POPS-281
Pops encryption cleanup. Added dates to flight meals, but these ARE NOT used yet. Just place holders.
POPS-245 / POPS-263 / POPS-264 - Customer error handling
POPS-318
email translations+more; add carrier logo (incomplete); null theme to fall back on
add specific time and carrier info for getFlightDataForFlight; and use it to determine carrier
POPS-278 Resolved
Merge branch 'develop' of https://github.com/mjm0therway/pre-order-broadleaf-repositor into develop
Meal Select button translate
Admin show multi carrier
crew report crude first checkin