edit tab logic
Merge branch 'feature/regirstrators' of github.com:ulmic/nastachku into feature/regirstrators

* 'feature/regirstrators' of github.com:ulmic/nastachku:
  fix order pays with discount
add button to buy ticket to program
Merge branch 'feature/regirstrators' of github.com:ulmic/nastachku into feature/regirstrators

* 'feature/regirstrators' of github.com:ulmic/nastachku:
  add company to users table
  add redirect to registrator
Merge branch 'develop'
fix days and button
add timer
Merge branch 'feature/regirstrators' of github.com:ulmic/nastachku into feature/regirstrators

* 'feature/regirstrators' of github.com:ulmic/nastachku:
  fix paths
  fix schedule helper
  fix confim alert
Merge branch 'feature/regirstrators' into develop

* feature/regirstrators: (33 commits)
  add timer
  fix days and button
  fix paths
  fix schedule helper
  fix confim alert
  add company to users table
  add button to buy ticket to program
  add redirect to registrator
  edit tab logic
  fix order pays with discount
  edit logos
  fix
  add paid_users
  fix registrator inteface
  fix downloading files
  add link for badges
  add hashtech
  add download csv with badges
  add registrators
  fix
  ...
Merge branch 'develop' of github.com:ulmic/nastachku into develop

* 'develop' of github.com:ulmic/nastachku:
  add mailer worker
add mailer and remove dollar to ok
add timer to schedule
remove timer from schedule
some fixes
Merge branch 'release/v30.3'

* release/v30.3: (30 commits)
  some fixes
  remove timer from schedule
  add timer to schedule
  add timer
  fix days and button
  fix paths
  fix schedule helper
  fix confim alert
  add company to users table
  add button to buy ticket to program
  add redirect to registrator
  edit tab logic
  fix order pays with discount
  edit logos
  fix
  add paid_users
  fix registrator inteface
  fix downloading files
  add link for badges
  add hashtech
  ...
Merge branch 'master' of github.com:ulmic/nastachku

* 'master' of github.com:ulmic/nastachku:
banner edited
Merge branch 'hotfix/edit_banner'

* hotfix/edit_banner:
  banner edited
Merge branch 'hotfix/edit_banner' into develop

* hotfix/edit_banner:
  banner edited
Merge branch 'master' of github.com:ulmic/nastachku

* 'master' of github.com:ulmic/nastachku:
  add mailer and remove dollar to ok

Conflicts:
	app/views/layouts/web/shared/_plaha.html.haml