Mailer work
Merge branch 'master' of github.com:oranges13/great-design