Merge branch 'hotfix/problem_with_fotorama' into develop

* hotfix/problem_with_fotorama:
  fix teacher decorator
  fotorama is working
fix helpers
Merge branch 'develop'

* develop:
  fix helpers