added nodemailer functionality
Merge branch 'master' into furtherintegration
resolving merge conflicts
Merge branch 'furtherintegration'