Merge branch 'features/more_searching' into develop
Merge branch 'develop' of github.com:empirical-org/Empirical-Core into develop