Sort By Feature on the Search page
Merge branch 'Feature_Search_Sort' into develop