fixed email issues concernig e-mail i got
Merge branch 'develop' into develop-js