Issue #439
Merge branch 'master' of https://github.com/olga-jane/prizm into Settings

Conflicts:
	src/Data/DAL/Hibernate/CategoryRepository.cs
Merge pull request #460 from olga-jane/master

Update O_Morozova
Merge remote-tracking branch 'origin/master' into Morozova_UI
Merge remote-tracking branch 'origin/master' into Morozova_UI
destination ComboBox was replaced by a TextEdit
Merge branch 'master' into sidorov_DestinationRailcarNew
rename default emptySpaceItems
delete unsaved entries
delete unsaved plateManufacturers
Visual changing
Merge pull request #464 from olga-jane/O_Morozova

O Morozova
Merge pull request #465 from olga-jane/sidorov_DestinationRailcarNew

Sidorov destination railcar new
Merge pull request #466 from olga-jane/DelTypesAndTests

Del types and tests
Merge pull request #467 from olga-jane/Morozova_UI

Morozova UI
UI change

1) Heat and purchase order forms - show center
2) Welderds and inspectors  open from main menu
settings fixed grids columns size
issue #439
Merge branch 'master' of https://github.com/olga-jane/prizm into Settings

Conflicts:
	src/PrizmMainProject/Properties/Resources.resx
Merge pull request #469 from olga-jane/master

Update O_Morozova