[ME, MJ]{other} added change email settings
Merge branch 'client' of github:heinzburgstaller/sw14_xp_01 into client
Merge branch 'client' of github:heinzburgstaller/sw14_xp_01 into client