add timepad, again
Merge branch 'hotfix/remove_sponsor'

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

* 'master' of github.com:ulmic/nastachku:
  add timepad, again
removed sponsor
Merge branch 'hotfix/remove_sponsors2'

* hotfix/remove_sponsors2:
  removed sponsor
Merge branch 'hotfix/remove_sponsors2' into develop

* hotfix/remove_sponsors2:
  removed sponsor
  add timepad, again
optimize helper
optimize program
fix order helper
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