Merge branch 'fastfix'
gosti = exspert
Merge branch 'fotofix' into develop