v1
Issue #534 pipeDeactivation
Merge branch 'master' of https://github.com/olga-jane/prizm into Protsenko_construction
Heat custom gridLookUpEdit
fixed Resources file
Merge branch 'master' of https://github.com/olga-jane/prizm into Protsenko_construction

Conflicts:
	src/PrizmMainProject/Properties/Resources.resx
add filter selection for Not Active Categories
v3
Issue #534: set required fields, forms caption
Merge remote-tracking branch 'origin/master' into CustomGridLookUp

Conflicts:
	src/PrizmMainProject/Forms/PipeMill/NewEdit/MillPipeNewEditXtraForm.cs
Merge pull request #624 from olga-jane/Morozova_BugFix

Fixed Resources file for Hint for pipe number format
Merge remote-tracking branch 'origin/master' into CustomGridLookUp
add nullReference check
Merge pull request #626 from olga-jane/sidorov_HideForNotActive

add filter selection for Not Active Categories
Merge pull request #628 from olga-jane/Protsenko_construction

Joint at construction 1st phase
Merge pull request #629 from olga-jane/CustomGridLookUp

Custom grid look up for Heat & Purchase order
Merge pull request #630 from olga-jane/sidorov_ComponentNotExist#618

add nullReference check (Exception appears if typed component does not exist)
fix Form name
Merge remote-tracking branch 'origin/master' into Morozova_UI

Conflicts:
	src/PrizmMainProject/Forms/Settings/SettingsXtraForm.Designer.cs