1) removed useless mail configuration
2) update the props file
Merge branch 'develop'