Bumped Version
Add from address to mailer_template
Merge branch 'v1.1.0'