POPS-288 | Add disclaimer to confirmation email, also fixed changed button styles and tags in emails
Merge pull request #32 from vinkobuble/develop

POPS-266 don't show flight or meals for departed flight on the Confirmat...
POPS-291 | Fix to dashboard page
removed not needed pops template files dashboard and orderreview1, and renamed dashboard2 as dashboard
POPS-303 | Confirmation page had different UI components, refactored both pages, updated conditionals
French translation on html, for example
French translations for meals
Breakfast, Lunch, Dinner en francais, mon ami
remove methods not in use; order confirm to re-read transaction (not rely on session); multi-lingual the confirm email
dashboard should read from the meal_selection_confirmed table
POPS-190 Configure egat tomcat server depoyment deom jenkins
Merge branch 'develop' of github.com:mjm0therway/pre-order-broadleaf-repositor into develop