Merge pull request #17 from vinkobuble/develop

POPS-191 add multi-flight timer countdown on meal select page
order review and confirm layout update
POPS-184 timer should stop passenger
Merge branch 'develop' of github.com:mjm0therway/pre-order-broadleaf-repositor into develop

Conflicts:
	site/src/main/webapp/WEB-INF/templates/pops/dashboard2.html