Merge branch 'master' of E:\Dokumenty\CVUT\TEAM\GITHUB\Knihovna with conflicts.
Merge remote-tracking branch 'origin/master'
vzhledova zmena prihlasovaciho formulare