Merge branch 'master' into feature/universities
Styling tweaks for unis/sign in
Merge conflicts