userMailer
Merge branch 'master' of https://github.com/khcr/resj

Conflicts:
	app/mailers/user_mailer.rb