Add a checkbox to answer if the user want to have notifications on his desktop
Merge remote-tracking branch 'origin/master'