backup commit
Merge branch 'rails_4' of github.com:Stex/ar_mailer_revised into rails_4