move info from users/new to header
Merge branch 'develop' of github.com:ulmic/nastachku into develop

* 'develop' of github.com:ulmic/nastachku:
  move info from users/new to header

Conflicts:
	app/views/web/users/new.html.haml
Merge branch 'hotfix/pay_fixes' into develop

* hotfix/pay_fixes:
  remove raise
  fix first_and_secon_day
Merge branch 'hotfix/fix_locales' into develop

* hotfix/fix_locales:
  some locales
add credential.yml
Merge branch 'develop'

* develop:
  add credential.yml
  move info from users/new to header