edit configus
fix time
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