(Mindy, Nicola and Alex - Added logout for admin in background block to fix feature.
Refactored login.
Fixed logout tests.
We had to resize the browser because we couldn't check that the user was logged in.)
Merge remote-tracking branch 'origin/master'