Merge branch 'master' of git-ssh.mittelab.org:glavermi/beautyNotification