Target latest Broadleaf 3.1 snapshot
update config for 3.1
Revert: update config for 3.1 (bc43319b5cdbf774a0cd2bdf07b39e7977e276ac)
Replace Fancybox with Simplemodal
Merge from 3.1.x