Closing out of the logout modal now cancels the logout countdown
Merge branch 'master' into beta-ui