Merge conflict in news_listing.html
Merge branch 'develop' of github.com:torchbox/verdant-rca into develop