Fixes #913 - Fix deletes in the admin with @ManyToMany without a join entity in-between
Fixes #923 - Allow filtering on a collection property when it is apart of a foreign key but already annotated as an @AdminPresentationCollection
Add license header
Fixes #927 - Fix permissions and annotations for Catalogs to be managed in the admin
Fixes #905 - Update Spring to the latest 3.2 patch release
Fixes #928 - Upgrade Thymeleaf to the latest patch release
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x

Conflicts:
	pom.xml
Fixes #929 - Update Thymeleaf to the latest patch release
#926 - Establish an alternate path for generating a fetch query for collections inside an @Embeddable, since the existing JPA criteria approach exposes a Hibernate issue
Merge remote-tracking branch 'origin/BroadleafCommerce-3.1.x' into BroadleafCommerce-3.1.x
Merge branch 'BroadleafCommerce-3.1.x' into develop

Conflicts:
	core/broadleaf-framework/src/main/resources/config/bc/sql/load_admin_permissions.sql