Merge branch 'emails'
Merge branch 'master' of github.com:pam-/mappetizer