fix encoding
Merge remote-tracking branch 'origin/master' into UserRoleEncoding

Conflicts:
	src/PrizmMainProject/Forms/Settings/SettingsXtraForm.Designer.cs
encoding fix after merge
add readOnle property for steelGrade
Merge remote-tracking branch 'origin/master' into UserRoleEncoding
add lookUpEdit to control and result types columns
Merge pull request #229 from olga-jane/master

Update O_Morozova
Merge branch 'sidorov_MillViewModelRepo' into sidorov_ReadOnlyFix

Conflicts:
	src/PrizmMainProject/Properties/licenses.licx
update Domain.csproj
fix according to issues:
 grid at "Find pipes" is editable #212
 At new pipe: shipping date has value (shouldn't) #215
add restriction for AddPipe to Railcar
Merge pull request #228 from olga-jane/sidorov_MillViewModelRepo

create common repository fore PipeMill, add PipeMillSizeType
role encoding fix
update lookUpEdit elements for control/result type
Merge pull request #230 from olga-jane/O_Morozova

O morozova
Merge pull request #231 from olga-jane/sidorov_ReadOnlyFix

Sidorov read only fix
combine RailcarRepo & PipeRepo in one proxy RailcarRepositories

fix UnitTests
fix in newPipe unit test
add PipeType column into search pipe grid
add DatabaseMigrator project