Displays currency in cart
Prevents NPE when banner ad is deleted from admin
Prevents NPE when banner ad is deleted from admin
Merge branch 'BroadleafCommerce-3.0.x' of github.com:watermelonjuice/DemoSite into watermelonjuice-BroadleafCommerce-3.0.x