Merge pull request #91 from mtc2013/mailer_fix

Bug fix for admin mailer template
Merge branch 'develop' of https://github.com/AgileVentures/LocalSupport into admin_mail_merge