enhance for result alert UI  and reset email
Merge remote-tracking branch 'origin/myweb2.1_ejs' into myweb2.1_ejs