Merge pull request #14 from chenjiayuan/jchen

mailer fix
Mailer fixed to send with button push
Merge pull request #15 from chenjiayuan/cbissell

Mailer fixed to send with button push
4-25
Merge branch 'develop'
hide action 2, added manager column
hide action 2, added manager column