Issue #534 - Added base entities
Continue Issue #541 (joint)
Merge branch 'master' of https://github.com/olga-jane/prizm into Protsenko_construction

Conflicts:
	src/Data/Data.csproj
	src/PrizmMainProject/PrizmApplication.csproj
Fix merge conflict
Merge pull request #541 from olga-jane/Protsenko_construction

 Joint at Construction 1st phase - Added base entities