changed how we set the timer
Merge remote-tracking branch 'origin/logout' into develop