Merge branch 'hotfix/send_group_images' into develop
Merge branch 'hotfix/kill_switch' into develop
Merge branch 'hotfix/remove_marks' into develop
fixed merge conflicts
Merge branch 'master' into develop
removed setting of user on conversations
added ability to show notifications for chrome
request for permission before showing notifications
added desktop notifications
Merge branch 'feature/desktop_notifications' into develop
displaying notification correctly
removed logging of message received
Merge branch 'release/notifications'