fixed the time date on front
fix Salman's profile
changed mailer settings
Merge remote-tracking branch 'origin/integration'