Merge pull request #24 from vinkobuble/develop

POPS-222 The format of the timer if less than 24 hours
fix duplicate meal selection checking
Merge branch 'develop' of https://github.com/mjm0therway/pre-order-broadleaf-repositor into develop
work in progress - confirmation number move from pops_customer to pops_transaction
rebuild cart: this works better still not perfect. don't call it yet
confirm email reading from MEAL_SELECTION
POPS-235 / POPS-236 / POPS-234 / POPS-243 - Updated global templates, css and them fiels, updated meal select template, update meal selected modal
Merge branch 'develop' of https://github.com/mjm0therway/pre-order-broadleaf-repositor into develop
Merge branch 'develop-confirm-number-move' into develop

Conflicts:
	site/src/main/java/com/mycompany/controller/pops/PreOrderController.java
Merge branch 'develop' of https://github.com/mjm0therway/pre-order-broadleaf-repositor into develop
POPS-231 correct timezone for notification email trigger