Changed delay on email alerts
Merge branch 'develop'

* develop:
  Changed delay on email alerts