Merge pull request #47 from vinkobuble/develop

POPS-357 Incorrect message displays on flight confirm screen when flight...
POPS-355 On token expire page, 'Return to home page' button is navigating to wrong screen
Merge branch 'develop' of github.com:mjm0therway/pre-order-broadleaf-repositor into develop