Changes
Merge branch 'master' of https://github.com/SpoonFeed/spoonfeed-angular into feature/39-video-chat
Fix logout a bit
Merge branch 'feature/39-video-chat'