Merge & Conflict resolved + User Session for Voting + Verification Email text change. + Forgot Password + Miss-match of the icons