controller -> admin
Merge branch 'master' of github.com:88labs/mailer