Finish majority of work on email tool, tweaks and fixes here and there
Merge branch 'org-man' of https://github.com/jdeanwaite/eDVR into org-man

Conflicts:
	models/user.js
Merge branch 'org-man' of https://github.com/jdeanwaite/eDVR into org-man

Conflicts:
	models/missionary.js
	mods/management/imos/db.js