Merge pull request #131 from olga-jane/master

Update branch O_Morozova
update Forms from Mill menu
AppConceptMVVM MillPipe
change position
rename and set constant system color "MenuBar" for EvenRow of grid
Merge pull request #136 from olga-jane/D_Sidorov

rename and set constant system color "MenuBar" for EvenRow of grid
фв
PRIZMA_Design.uml - add repository and implementation

Domain Entity some fix in
change id => Guid
PRIZMA_Design.uml add pipe proxy
Merge remote-tracking branch 'origin/master' into D_Kulish_1

Conflicts:
	docproj/PRIZMA_Design.uml
	src/Domain/Entity/Mill/PipeTest.cs
	src/Domain/Entity/Mill/PipeTestResult.cs
	src/Domain/Entity/Mill/TensileTests.cs
Merge pull request #134 from olga-jane/D_Kulish_1

PRIZMA_Design
Merge branch 'K_Protsenko_branch' of https://github.com/olga-jane/prizm into D_Sidorov

Conflicts:
	db/script/createDb.sql
external moved to separate repository prizm_external
fixing: drop column pipeId at welt table
final update Forms from mill menu
Return edited entitys

This reverts commit 37e5c845d85ae0a2c0cf699c3ba53f94c18a2212.

Conflicts:
	src/Domain/Entity/Mill/PipeTest.cs
	src/Domain/Entity/Mill/PipeTestResult.cs
	src/Domain/Entity/Mill/TensileTests.cs
Merge pull request #142 from olga-jane/D_Kulish_1

Return edited entity for conflict resolve
Merge pull request #141 from olga-jane/D_Sidorov

Totally changed script to create DB
Merge remote-tracking branch 'origin/master' into K_Protsenko_branch