UserMailer
Welcome email
Install rails-observer
Text mail template removed
smtp settings for develop
url fix
add user url
Sending email on user creation using observer
Merge branch 'feature/mailer' into develop

* feature/mailer:
  Sending email on user creation using observer
  add user url
  url fix
  smtp settings for develop
  Text mail template removed
  Install rails-observer
  Welcome email
  UserMailer

Conflicts:
	config/application.rb
i18n for user label on the Post new/edit form
Merge branch 'release/mailer'

* release/mailer:
  i18n for user label on the Post new/edit form
  Sending email on user creation using observer
  add user url
  url fix
  smtp settings for develop
  Text mail template removed
  Install rails-observer
  Welcome email
  UserMailer
Merge tag 'mailer' into develop

v1.93

* tag 'mailer':
  i18n for user label on the Post new/edit form