Merge branch 'hotfix/password_fixes' into develop

* hotfix/password_fixes:
  password conf
Merge branch 'master' of github.com:ulmic/nastachku into develop

* 'master' of github.com:ulmic/nastachku:
Merge branch 'hotfix/remove_regexp_from_userrb' into develop

* hotfix/remove_regexp_from_userrb:
  remove regeexp
fix merge conflict
fix sponsors
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
  ...
fix remind password errors messages
Merge branch 'develop' of github.com:ulmic/nastachku into develop

* 'develop' of github.com:ulmic/nastachku:
  fix remind password errors messages
  fix sponsors
Merge branch 'hotfix/production_deploy_2' into develop

* hotfix/production_deploy_2:
  app name changed
Merge branch 'hotfix/unicorn_production' into develop

* hotfix/unicorn_production:
  production unicorn workdir changed
Merge branch 'hotfix/unicorn_production_2' into develop

* hotfix/unicorn_production_2:
  unicorn config workdir changed
Merge branch 'hotfix/stub_remove' into develop

* hotfix/stub_remove:
  stub removed
restore public
fix regex
Merge branch 'develop'