smtp settings updated
Merge branch 'development' into staging