Merge branch 'hotfix/fix_code'

* hotfix/fix_code:
  add decorators
  add sections
Merge branch 'develop'
Merge branch 'develop'

* develop:
  fix timeline
  good output lectures
  add section colors to program
  add section colors to program
  output lectures
  output first hall lecture
  output timeline
  add halls titles
Merge branch 'master' of github.com:ulmic/nastachku

* 'master' of github.com:ulmic/nastachku:
  full description of pluso
  fix
Merge branch 'develop'

* develop:
  fix string ending
  fix controllers auth
  add auth popup
  add voting button
Merge branch 'develop'

* develop:
  fix output program
Merge branch 'develop'

* develop:
  add second day
remove time zone
Merge branch 'hotfix/fix_time' into develop

* hotfix/fix_time:
  remove time zone