Added Grouping to Index
Refactored Solr so it supports Grouping but is still reverse compatible