Merge branch 'master' into bento
Cleaned up views.
Reinstate articles view folder.
Clean up front end.
Merge branch 'bento' into development
Improve EDS integration.
Refactor bento controller: first pass.
Tweak EDS facet in bento controller.
Clean up EDS integration.
Remove redundant bento display.
Merge branch 'bento' into development