Merge branch 'master' into Filip_Bouska
Pridan Filip
Merge branch 'Filip_Bouska'