change back to gmail smtp in production
fixing conflict
Merge branch 'development'
change default from email