Merge remote-tracking branch 'upstream/master' into develop
Merge remote-tracking branch 'upstream/master' into develop
breaking out email templates to reusable parts, and with helper methods

- Moving link generators to helpers, testing is easier
- Adding application_helper to the mailer classes
- Passing tests
Merge remote-tracking branch 'upstream/master' into develop
Merge pull request #425 from set5think/develop

breaking out email templates to reusable parts, and with helper methods