Merge branch 'hotfix/password_fixes'

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

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

* hotfix/remove_regexp_from_userrb:
  remove regeexp