Update mailer to R3, bug fixes
Merge branch 'r3_upgrade' of https://github.com/suegrimes/ISCC_LIMS.git into r3_upgrade

Conflicts:
	app/views/users/forgot.html.erb
	app/views/users/new.html.erb
	app/views/users/reset.html.erb