Merge branch 'hotfix/edit_restorant_partners' into develop

* hotfix/edit_restorant_partners:
  fix restorans partners
  fix time
  fix of fix of fix
  fix
edit configus
fix adaptive
Merge remote-tracking branch 'origin/develop' into develop
fix time
fix touchcarousel, again
Merge branch 'feature/edit_program_time' into develop

* feature/edit_program_time:
  fix time
  edit configus
Merge branch 'develop' of github.com:ulmic/nastachku into develop

* 'develop' of github.com:ulmic/nastachku:
  fix touchcarousel, again
  fix adaptive
fix program
add info to contact page
Merge branch 'develop'

* develop:
  add info to contact page
  fix program
  fix touchcarousel, again
  fix time
  fix adaptive
  edit configus