Merge pull request #20 from Elffers/ajaxing

Ajaxing
Merge branch 'master' into ajaxing
refactor mailers