Merge origin/master
Cleaned up unused files, fixed logout