Merge branch 'develop' of github.com:ulmic/nastachku

* 'develop' of github.com:ulmic/nastachku:
  no platidoma
  fix token life
  fix welcome page
  token lifetime to 24h
  delete i will go and add login
  add password validation
  fix user validates
  fix seed
  add destroy button
  fix seed
  some pretty code
  pay state event work in adminka
  move header from users/new to layouts/header
  flash error if activate link not valid
  flash error for not valid email in remind password
regexp commented
Merge branch 'hotfix/comment_regexp'

* hotfix/comment_regexp:
  regexp commented
Merge branch 'hotfix/comment_regexp' into develop

* hotfix/comment_regexp:
  regexp commented
  no platidoma
  fix token life
  fix welcome page
  token lifetime to 24h
  delete i will go and add login
  add password validation
  fix user validates
  fix seed
  add destroy button
  fix seed
  some pretty code
  pay state event work in adminka
  move header from users/new to layouts/header
  flash error if activate link not valid
  flash error for not valid email in remind password
Merge branch 'develop'

* develop:
password conf
Merge branch 'hotfix/password_fixes'

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

* 'master' of github.com:ulmic/nastachku: