Collecitons

Push current changes
Merge branch 'feature-bs3-collections' of https://github.com/ten24/Slatwall into feature-bs3-collections

Conflicts:
	admin/layouts/default.cfm