Cleaning up front end logout logic
Merge branch 'develop'