implemented logout (without having the template)
Merge remote-tracking branch 'origin/master'