POPS-191 part 1 - acknowledging multi-flight structure
Merge branch 'develop' of github.com:mjm0therway/pre-order-broadleaf-repositor into develop

Conflicts:
	site/src/main/webapp/WEB-INF/templates/pops/dashboard2.html
merge conflict
Merge pull request #15 from vinkobuble/develop

POPS-191 part 1 - adoption for multi flight scenarion