Added margin on createcollection
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
Merge pull request #2482 from ten24/feature-4-uiexamples

Feature 4 uiexamples
Added order assignment feature
Merge branch 'develop-4' of https://github.com/ten24/Slatwall.git into develop-4
Merge pull request #2483 from ten24/feature-4-uiexamples

Basic - fix min height on list
patching alias issue for orders
Fixes bug with column renaming for encryption on Setting record
Added importants to fix positioning on autocomplete in create order
Updated Version 3.4.028.023
Merge branch 'develop' into develop-4

Conflicts:
	version.txt
got the correct icon
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
Merge pull request #2485 from ten24/feature-4-accountPickerFixes

Added importants to fix positioning on autocomplete in create order
Added css for autocomplete-selected