issue #582 small fix on alerts subscription
small fix on email validation
Merge branch 'develop' into testing