Issue #541 : control operations
Merge branch 'master' of https://github.com/olga-jane/prizm into Protsenko_construction

Conflicts:
	src/PrizmMainProject/Properties/Resources.Designer.cs
	src/PrizmMainProject/Properties/Resources.resx
Merge branch 'master' of https://github.com/olga-jane/prizm into Protsenko_construction
Issue #574 - changed Joint operation setup (type)
modify Joint table in db
Merge pull request #580 from olga-jane/O_Morozova

modify Joint table in db
Merge branch 'master' of https://github.com/olga-jane/prizm into Protsenko_construction

Conflicts:
	src/DatabaseMigrator/Scripts/fillDb.sql
	src/PrizmMainProject/Forms/Joint/NewEdit/JointNewEditViewModel.cs
	src/PrizmMainProject/Properties/Resources.resx
Issue #541 weldResults
fix
Merge pull request #577 from olga-jane/Protsenko_construction

Joint at construction 1st phase Issue #541
Merge pull request #585 from olga-jane/Crash559

Crash fix
Merge branch 'master' into sidorov_InspectionComponentCreation

Conflicts:
	src/PrizmMainProject/Properties/Resources.resx