email sending and aop implemented
Merge remote-tracking branch 'origin/aop'