Moved "Master" entity to separated class. Light redesing
Merge branch 'master' of https://github.com/vladimir-tymishak/web_diploma