Solr search integration
Merge branch 'atwix_feature/solr' into atwix