Merge branch 'develop' of github.com:ulmic/nastachku into develop

* 'develop' of github.com:ulmic/nastachku:
  fix adaptiv
  fix of the fix
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'hotfix/hide_my_program_button' into develop

* hotfix/hide_my_program_button:
  hide button
Merge branch 'develop' of github.com:ulmic/nastachku into develop

* 'develop' of github.com:ulmic/nastachku:
  fix
Merge branch 'master' into develop
Merge remote-tracking branch 'origin/develop' into develop
fix time
Merge branch 'develop'