email authentication with SSL config option added
Merge branch 'develop'