Changed SMTP settings
Fix for text issues
Fix for text issues
Fix for text issues
Changed SMTP settings
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	config/environments/development.rb
Fix for date format
Fix for date format