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