Eric Dev Push

This will include Solr Search updates and cutting tools updates.