Merge branch '890-dev' into 'develop'

server/conf/mail/db_quota_notification_fr.txt

server/conf/mail/db_quota_notification_nl.txt

server/conf/mail/db_quota_ok_notification_fr.txt

server/conf/mail/db_quota_ok_notification_nl.txt

server/conf/mail/mail_quota_notification_fr.txt

server/conf/mail/mail_quota_notification_nl.txt

server/conf/mail/mail_quota_ok_notification_fr.txt

server/conf/mail/mail_quota_ok_notification_nl.txt

server/conf/mail/web_quota_notification_fr.txt

server/conf/mail/web_quota_notification_nl.txt

server/conf/mail/web_quota_ok_notification_fr.txt

server/conf/mail/web_quota_ok_notification_nl.txt

server/conf/mail/web_traffic_notification_fr.txt

server/conf/mail/web_traffic_notification_nl.txt

server/conf/mail/welcome_email_fr.txt