Merge pull request #2433 from ten24/feature-4-collections

Feature 4 collections
Added conditional into hibachientitydetailgroup
Merge pull request #2434 from ten24/feature-4-addCountryResolution

Added conditional into hibachientitydetailgroup
updating rest api to support keywords
adjustments to the keywords rest api
Merge branch 'develop-4' of https://github.com/ten24/Slatwall into feature-4-collections