added settings to login-window
Merge branch 'ChatManager' of https://github.com/sepm-depm/sepm-group into ChatManager