Update upto 10.4
Merge branch 'master' into account-activation-password-reset

Conflicts:
	db/schema.rb - FIXED
Completed basic activation
Completed Password Reset in Development
Added prod configurations for SendGrid
Added letteropener gem for development