filter existing collections by the base entity of the current collection
we are editing
Merge branch 'feature-bs3-collections' of
https://github.com/ten24/Slatwall into feature-bs3-collections

Conflicts:
	admin/client/slatwalladmin/js/controllers/collections.js
	admin/client/slatwalladmin/js/services/slatwallService.js
	api/controllers/main.cfc