Test develop
nov
nov master
fix conflict
vraceno na staro