Added "files" parameter to attach files to the e-mail
Merge branch 'sapns__mails' into master2