Target latest 3.1, 3.1.10-SNAPSHOT
Target 3.0.15-GA
Target latest 3.0 snapshot
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x

Conflicts:
	pom.xml
Target 3.1.10-GA
Merge tag 'broadleaf-3.1.10-GA'