refactoring
resolved conflicts for refactoring
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
ContentFilter
resolved conflicts
Merge remote-tracking branch 'origin/master'
SearchByContent - service & repository
serch service - resolved conflicts