Merge tag 'v1.70' into develop

v1.70

* tag 'v1.70':
  cocoon
Welcome message translation moved to shared translations
Merge branch 'hotfix/welcome-translation'

* hotfix/welcome-translation:
  Welcome message translation moved to shared translations
Merge tag 'welcome-translation' into develop

v1.71

* tag 'welcome-translation':
  Welcome message translation moved to shared translations
users scaffold
test refactoring
User email validation
Email downcase
Password digest
Email without case sensitive
Password for user, factories for user controller testing
Password fields on user form
Dummy user association with post on user createion/editing
Dummy users associations on posts/comments
Markup, I18n
Merge branch 'feature/users' into develop

* feature/users:
  Markup, I18n
  Dummy users associations on posts/comments
  Dummy user association with post on user createion/editing
  Password fields on user form
  Password for user, factories for user controller testing
  Email without case sensitive
  Password digest
  Email downcase
  User email validation
  test refactoring
  users scaffold

Conflicts:
	app/views/layouts/application.html.haml
	app/views/layouts/web/application.html.haml
Merge branch 'release/users'

* release/users:
  Markup, I18n
  Dummy users associations on posts/comments
  Dummy user association with post on user createion/editing
  Password fields on user form
  Password for user, factories for user controller testing
  Email without case sensitive
  Password digest
  Email downcase
  User email validation
  test refactoring
  users scaffold