Merge branch 'develop'
Merge branch 'develop'
Remove file
Merge branch 'master' into develop
Tweaks to search page.
Added user sidebar filter
Complete filtering by user on home page