some refactoring
add my programm ids
add js and fix haml
Merge branch 'feature/my_program' into develop

* feature/my_program:
  add js and fix haml
  add my programm ids
  some refactoring
fix helper
Merge branch 'develop' of github.com:ulmic/nastachku into develop

* 'develop' of github.com:ulmic/nastachku:
  add cache tests
  fix if user not authorized
  fix schedule caching

Conflicts:
	app/controllers/web/schedules_controller.rb
	app/helpers/web/users_helper.rb
fix js
Merge branch 'release/v29.2'

* release/v29.2:
  fix js
  fix helper
  add js and fix haml
  add my programm ids
  add cache tests
  fix if user not authorized
  some refactoring
edit partners
Merge branch 'hotfix/sponsors3'

* hotfix/sponsors3:
  edit partners
add partner
Merge branch 'hotfix/sponsor4'

* hotfix/sponsor4:
  add partner
Merge branch 'master' of github.com:ulmic/nastachku

* 'master' of github.com:ulmic/nastachku:
  .