urgent fix to email
Merge branch 'production'
Merge branch 'master' of github.com:ucsd-ra/ug_research_portal

Conflicts:
	app/views/notifications/send_invite.html.erb