Fixed demo site for changes referenced in this issue:
https://github.com/BroadleafCommerce/BroadleafCommerce/issues/81
Merge branch 'develop' into feature-sitemaps