4.1

Michael Fairchildrequested to merge
4.1 into master

Please don't merge until we are closer to launch.

Outstanding issues:

  1. Styling of the search input group needs adjustment (button is not aligned correctly)
  2. Testing

Merge request reports