Merge branch 'development' into osc
first changes in searchspecs after correct implementation of searchcomponents in solrconfig
Merge branch 'osc' into development