node_modules
Merge remote-tracking branch 'origin/master'

Conflicts:
	node_modules/nodemailer/node_modules/directmail/package.json
	node_modules/nodemailer/node_modules/he/package.json
	node_modules/nodemailer/node_modules/mailcomposer/node_modules/dkim-signer/package.json
	node_modules/nodemailer/node_modules/mailcomposer/node_modules/follow-redirects/node_modules/underscore/package.json
	node_modules/nodemailer/node_modules/mailcomposer/node_modules/follow-redirects/package.json
	node_modules/nodemailer/node_modules/mailcomposer/node_modules/mime/package.json
	node_modules/nodemailer/node_modules/mailcomposer/node_modules/mimelib/node_modules/addressparser/package.json
	node_modules/nodemailer/node_modules/mailcomposer/node_modules/mimelib/node_modules/encoding/node_modules/iconv-lite/package.json
	node_modules/nodemailer/node_modules/mailcomposer/node_modules/mimelib/node_modules/encoding/package.json
	node_modules/nodemailer/node_modules/mailcomposer/node_modules/mimelib/package.json
	node_modules/nodemailer/node_modules/mailcomposer/node_modules/punycode/package.json
	node_modules/nodemailer/node_modules/mailcomposer/package.json
	node_modules/nodemailer/node_modules/public-address/package.json
	node_modules/nodemailer/node_modules/readable-stream/node_modules/core-util-is/package.json
	node_modules/nodemailer/node_modules/readable-stream/node_modules/inherits/package.json
	node_modules/nodemailer/node_modules/readable-stream/node_modules/isarray/package.json
	node_modules/nodemailer/node_modules/readable-stream/node_modules/string_decoder/package.json
	node_modules/nodemailer/node_modules/readable-stream/package.json
	node_modules/nodemailer/node_modules/simplesmtp/node_modules/rai/package.json
	node_modules/nodemailer/node_modules/simplesmtp/node_modules/xoauth2/package.json
	node_modules/nodemailer/node_modules/simplesmtp/package.json
	node_modules/nodemailer/package.json
ix to participant contoller
update to emailing - sender and recipient is now dynamic
scheduler UI updates