action mailer branch
action mailer success
merged user controller