#5 - Refactoring of entities and project.
Merge branch 'master' of https://github.com/MilanPohancenik/Web.git