fixed email issues concernig e-mail i got
Merge branch 'develop' into develop-js
Merge pull request #321 from tkowark/develop-js

Develop js