Merge remote-tracking branch 'upstream/master'
Facet Count removed
Merge remote-tracking branch 'upstream/master'

Conflicts:
	opencommercesearch-common/src/test/java/org/opencommercesearch/AbstractSearchServerIntegrationTest.java
Merge remote-tracking branch 'upstream/master'
add filtering by country to the getFacet method
Merge remote-tracking branch 'upstream/master'
Added support for custom breadcrumbs for selected range queries
Added support for values specific messages for facet values
Fixed MissingResourceException with support range messages
Added metadata support to range and query facets
Refactored multipled facet tests
Added support for overlapping facets
apply code review changes for getFacet method
add support to getFacet to receive a list of filterQueries to allow
fitlering the results
Merge pull request #28 from lujameva/master

Rules with null start or end date are now retrieved.
Merge pull request #29 from gsegura/master

add filtering by country to getFacet method. Also add facet prefix for categoryPath facet
Merge branch 'master' of github.com:rmerizalde/opencommercesearch
Merge remote-tracking branch 'upstream/master'
Merge pull request #30 from naveenhooda2004/master

This has the group.facet=true
fix broken allow backorder functionality
Merge pull request #31 from gsegura/master

fix broken allow backorder functionality
Add support for custom sort for skus within a group
Merge branch 'master' of github.com:rmerizalde/opencommercesearch

Conflicts:
	opencommercesearch-common/src/main/config/solr/product_catalog/conf/xinclude/fields.xml
Delete evaluation collection files
revert change for sku feed check permission
add logic to escape queries that go to rules core to avoid exceptions in
search.
make sure that queries to rules match the exact search term when
retrieving rules