First Commit
Merge https://github.com/damos/SolrRollupQuery

rebasing
cleanup