mail/new mail/send added
Merge branch 'master' of https://github.com/zhaoyan1117/PeakDemand