Merge branch 'baseEntity' of https://gitlab.fi.muni.cz/xforman2/pv179-project into baseEntity