added email notification when changing state
Merge remote-tracking branch 'origin/master'