Target Broadleaf 3.1.3-SNAPSHOT
Change the default Google Analytics processor to the universal one for BroadleafCommerce/BroadleafCommerce#861
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x

Conflicts:
	site/src/main/webapp/WEB-INF/templates/layout/partials/head.html
Add example system properties for Google Analytics in BroadleafCommerce/BroadleafCommerce#861
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x
Update the Keytool Maven plugin to 1.5 for Java 8 support for BroadleafCommerce/BroadleafCommerce#873
Fixes #124 - Fix pom validation startup errors with jetty-demo by only requiring the hsqldb dependency for the db tasks
Fixes #123 - Reduce jetty startup time and prevent complete hanging execution on some systems as a result of using java.security.SecureRandom for session IDs
Fixes BroadleafCommerce/BroadleafCommerce#812 - Added multi-system-compatible profiles to properly resolve tools.jar
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x
Update bundle path

Related to:

https://github.com/BroadleafCommerce/BroadleafCommerce/commit/74d8eb5b536745114f938a83b89db2dfbd334b75#commitcomment-6494579

This change is only required if modules are being used.
#93 - update load script for ISO countries
Servlet configuration required for #869
BroadleafCommerce/BroadleafCommerce#952 - adding ability to Unconfirmed Credit Cards and Third Party Payments as well as a null payment gateway transaction service implementation
Move blMergeDataSources outside the comment block for the Null Payment Gateway to not confuse ppl following directions on the Payment Gateway docs
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x
Update to latest 3.0 GA
Update to the latest 3.0 SNAPSHOT
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x

Conflicts:
	pom.xml
Target latest 3.1 GA