fix test
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 'develop' of github.com:ulmic/nastachku into develop

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