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

* hotfix/edit_main_plaha:
  fix plaha
Merge branch 'master' of github.com:ulmic/nastachku

* 'master' of github.com:ulmic/nastachku:
  fix again again again schedule
fixed
Merge branch 'hotfix/fix_redirect' into develop

* hotfix/fix_redirect:
  fixed
Merge branch 'develop' of github.com:ulmic/nastachku into develop

* 'develop' of github.com:ulmic/nastachku:
  add broadcast to adminka
  add scheduler start
  add resque task