Merge branch 'GUI-008-oliver' of...

Merge branch 'GUI-008-oliver' of https://gitlab.fi.muni.cz/xbielik3/pb138_trackyourtime into GUI-008-oliver

merge with remote