Merge branch 'hotfix/secret_key'
smtp and secret key fixed
Merge branch 'hotfix/smtp' into develop