Merging Solr units into dams_units
Merging objects into dams_objects controller/views
Updating solr calls
Merge branch 'feature/hydrasolr-hybrid' into develop