posting to form data
Merge branch 'develop-4' of https://github.com/ten24/Slatwall into feature-4-collections
committing directory changes and code thus far
Merge branch 'develop-4' of https://github.com/ten24/Slatwall into feature-4-collections
saving currentstate
Merge branch 'develop-4' of https://github.com/ten24/Slatwall into
feature-4-collections

Conflicts:
	admin/client/js/slatwalladmin.js
Merge branch 'develop-4' of https://github.com/ten24/Slatwall into
feature-4-collections

Conflicts:
	admin/client/js/services/slatwall.js
Merge branch 'develop-4' of https://github.com/ten24/Slatwall into feature-4-collections
adding property displays for on the fly product bundlegrouptype adding.
new approach in services to reduce controller code.
changing baseentity property to collectionobject.
using params in get and post of $http.
posting in form data
Merge branch 'develop-4' of https://github.com/ten24/Slatwall into
feature-4-collections

Conflicts:
	admin/client/js/directives/partials/displayitem.html
	admin/client/js/directives/partials/displayoptions.html
	admin/client/js/directives/partials/editfilteritem.html
Merge pull request #2476 from ten24/feature-4-collections

Feature 4 collections