POPS-256 half way-done
POPS-260 POPS-261
Merge branch 'POPS-265' into develop
POPS-265 intermediate
Merge branch 'develop' of github.com:mjm0therway/pre-order-broadleaf-repositor into develop
POPS-265 Hide flight and meal selections if the flight has departed
Merge branch 'develop' of github.com:mjm0therway/pre-order-broadleaf-repositor into develop

Conflicts:
	site/src/main/webapp/WEB-INF/templates/pops/include/myselections.html
Merge pull request #31 from vinkobuble/develop

POPS-265 Hide flight and meal selections if the flight has departed