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

Conflicts:
	src/Data/DAL/Hibernate/CategoryRepository.cs
issue #439
Merge branch 'master' of https://github.com/olga-jane/prizm into Settings

Conflicts:
	src/PrizmMainProject/Properties/Resources.resx
operation code is required
fix merge bug
fixed calendar width
Merge pull request #470 from olga-jane/Morozova_UI

Morozova UI
Merge pull request #471 from olga-jane/Fixes

operation code is required
Merge pull request #472 from olga-jane/Settings

Issue #439
Added spacing
changed checked listbox caption
Merge pull request #473 from olga-jane/master

Update O_Morozova
fix bug
add check for Null reference
#359 Security setups
Merge branch 'master' into sidorov_TryDeleteNewRow
Issue  #453
Merge branch 'master' into security_setups

Conflicts:
	src/DatabaseMigrator/Scripts/CreateSchemeObjects.sql
	src/Domain/Domain.csproj
	src/PrizmMainProject/Forms/Settings/SettingsXtraForm.Designer.cs
	src/PrizmMainProject/Forms/Settings/SettingsXtraForm.cs
	src/PrizmMainProject/Forms/Settings/SettingsXtraForm.resx
	src/PrizmMainProject/Properties/Resources1.Designer.cs
	src/UnitTests/Forms/PipeMill/NewEdit/MillPipeNewEditCommandTest.cs
	src/UnitTests/Forms/Settings/SaveSettingsCommandTest.cs
Merge pull request #481 from olga-jane/security_setups

Security setups