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