Modifications for user notification mailer
Merge branch 'r3_upgrade' of https://github.com/suegrimes/OligoMgmt.git into r3_upgrade

Conflicts:
	app/mailers/user_notifier.rb
Modifications for Rails 3 'find' syntax