Merge branch 'hotfix/remove_regexp_from_userrb'

* hotfix/remove_regexp_from_userrb:
  remove regeexp
fix merge conflict
production user changed
Merge branch 'hotfix/production_deploy' into develop

* hotfix/production_deploy: (136 commits)
  production user changed
  fix regex
  no platidoma
  fix token life
  remove regeexp
  fix welcome page
  password conf
  regexp commented
  token lifetime to 24h
  delete i will go and add login
  add password validation
  removed
  add credential.yml
  some locales
  remove raise
  fix first_and_secon_day
  fix user validates
  fix seed
  add destroy button
  fix seed
  ...
Merge branch 'develop' of github.com:ulmic/nastachku into develop

* 'develop' of github.com:ulmic/nastachku:
  fix remind password errors messages
  fix sponsors