Merge branch 'develop'
Merge branch 'develop'
Merge branch 'hotfix/edit_sponsores'

* hotfix/edit_sponsores:
  edit sponsors
Merge branch 'master' of github.com:ulmic/nastachku

* 'master' of github.com:ulmic/nastachku:
  add timepad
  fix plaha
  touchcarouser in adaptive fix
  fix ' not a function'
  aling partners as center
  fix filtration
Merge branch 'develop'

* develop:
  fix hall adding
fix hall adding
Merge branch 'develop'

* develop:
  fix hall adding

Conflicts:
	app/models/lecture.rb
add sections
add decorators
Merge branch 'hotfix/fix_code' into develop

* hotfix/fix_code:
  add decorators
  add sections
  fix hall adding