Merge branch 'hotfix/add_dropdown'

* hotfix/add_dropdown:
  fix colors
merge
Merge branch 'develop'

* develop:
  add logos
Merge branch 'master' of github.com:ulmic/nastachku

* 'master' of github.com:ulmic/nastachku:
  fix adaptiv
  fix of the fix
hide button
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