Merge branch 'devel' into 'master'

Show mail address of the user in the user prefs

See merge request !155