adding action mailer gem and some changes to js
fixing conflicts