add lectures to join
add timepad, again
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'hotfix/remove_sponsor' into develop

* hotfix/remove_sponsor:
  partner removed
Merge branch 'develop' of github.com:ulmic/nastachku into develop

* 'develop' of github.com:ulmic/nastachku:
  add timepad, again
Merge branch 'hotfix/remove_sponsors2' into develop

* hotfix/remove_sponsors2:
  removed sponsor
  add timepad, again
set rails version
Merge branch 'feature_speedup_schedules' into develop
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'hotfix/optimize' into develop

* hotfix/optimize:
  fix order helper
  optimize program
  optimize helper
Merge branch 'develop' of github.com:ulmic/nastachku into develop

* 'develop' of github.com:ulmic/nastachku:
  set rails version
  add lectures to join

Conflicts:
	app/controllers/web/schedules_controller.rb
fix order_helper
Merge branch 'release/29.0.1'

* release/29.0.1:
  fix order_helper
  set rails version
  add timepad, again
  add lectures to join