Sort By Feature on the Search page
Merge branch 'Feature_Search_Sort' into develop
Changed the name of the sort type to "Type" from "resource"