initial changes
Merge branch 'BroadleafCommerce-3.0.x' of https://github.com/darcysaum/DemoSite into BroadleafCommerce-3.0.x