updates
mail working with validation
Merge remote-tracking branch 'remotes/origin/FLogin2' into devBranch