Merge branch 'development' into searching-aftermarkdown
Merge branch 'development' into searching-aftermarkdown
haystack settings changed to show 12 results per page
Merge branch 'searching-aftermarkdown' into development