Fotecky
Merge branch 'grafika_dev' into zuzka_test