Added mailer client, gmail.json file is on server but hidden
Merge remote-tracking branch 'origin/master'