POPS-175
Merge branch 'develop' of github.com:mjm0therway/pre-order-broadleaf-repositor into develop

Conflicts:
	site/src/main/java/com/mycompany/controller/pops/PreSelectController.java
Merge branch 'develop' of github.com:mjm0therway/pre-order-broadleaf-repositor into develop

Conflicts:
	core/src/main/java/com/mycompany/pops/dao/DaoUtil.java
	site/src/main/java/com/mycompany/controller/pops/PreSelectController.java
Merge branch 'develop' of github.com:mjm0therway/pre-order-broadleaf-repositor into develop
Merge pull request #14 from vinkobuble/develop

POPS-175 Fixes with data structure changes and modal dialog