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
Merge branch 'master' of github.com:gsegura/opencommercesearch
Adding Ranking Rules to rule based categories, part 1
Merge remote-tracking branch 'upstream/master'
Merge pull request #32 from gsegura/master

Escape query terms when querying rules core
make rules search query matching not bound to query property
Merge remote-tracking branch 'upstream/master'
Merge pull request #33 from gsegura/master

make sure  search query matching for rules don't use the field: "query". they should use the default text one.
Adding Ranking Rules to rule based categories, part 2
Merge remote-tracking branch 'upstream/master'
Handling null pointer exception because of change in API from google collect to java utils