Trying fix for negative time to logout window issue...
Merge branch 'develop' into feature/Bootstrap-CSS

* develop:
  Trying fix for negative time to logout window issue...
work in progress