Mail sender added
Sql file
Merge branch 'mail'
Merge remote-tracking branch 'upstream/master'