Updated mailer configuration for production and development
Merge pull request #9 from zauzaj/add-mailer-configuration

Updated mailer configuration for production and development
Merge pull request #10 from zauzaj/development

merge development into master