tabulka vytunena
Merge origin/master