changed email for devise emails
Merge branch 'develop'