adding workflow item to config
dynamically adding options for amounttype and amount
Merge branch 'develop-4' of https://github.com/ten24/Slatwall into feature-4-workflow
Merge branch 'develop-4' of https://github.com/ten24/Slatwall into feature-4-uiexamples
Merge branch 'develop-4' of https://github.com/ten24/Slatwall into
feature-4-workflow

Conflicts:
	admin/client/js/controllers/globalsearch.js
	admin/client/js/directives/partials/productbundle/createproductbundle.html
	admin/client/js/directives/partials/productbundle/productbundlegroup.html
Merge branch 'develop-4' of https://github.com/ten24/Slatwall into feature-4-workflow
Bundle create layout fix
Merge conficts
adding amount and amountType to productBundleGroup
Merge branch 'develop-4' of https://github.com/ten24/Slatwall into feature-4-workflow
removing console logs
removing dump
whitespace
Bundle add - fix
Merge branch 'develop-4' of https://github.com/ten24/Slatwall into feature-4-uiexamples
Merge pull request #2533 from ten24/feature-4-uiexamples

Feature 4 uiexamples
Merge pull request #2531 from ten24/feature-4-workflow

Feature 4 workflow
Merge branch 'develop-4' of https://github.com/ten24/Slatwall into feature-4-collections
saving changes
Bundle add - move search product options to left