adding product bundle filters. next step, processing them into a sku
collection config
Merge branch 'develop-4' of https://github.com/ten24/Slatwall into feature-4-collections
able to create productbundlegroups
Merge branch 'develop-4' of https://github.com/ten24/Slatwall into feature-4-collections
patching alias issue for orders
Merge branch 'develop-4' of https://github.com/ten24/Slatwall into
feature-4-collections

Conflicts:
	admin/client/css/main.css
Merge branch 'develop-4' of https://github.com/ten24/Slatwall into feature-4-collections
Merge pull request #2484 from ten24/feature-4-collections

Feature 4 collections