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
#17 - Remove outdated GWT and combined references in ant change-identifier task
Merge branch 'BroadleafCommerce-3.0.x' into develop
Use UTF-8 encoding by default
Merge branch 'BroadleafCommerce-3.0.x' into develop
Add <task:annotation-driven /> annotation to DemoSite
Merge branch 'develop' into feature-sitemaps

# By watermelonjuice (3) and others
# Via Andre Azzolini (2) and Phillip Verheyden (2)
* develop:
  Add <task:annotation-driven /> annotation to DemoSite
  Use UTF-8 encoding by default
  #17 - Remove outdated GWT and combined references in ant change-identifier task
  Prevents NPE when banner ad is deleted from admin
  Prevents NPE when banner ad is deleted from admin
  Displays currency in cart