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
fix merge bug
fixed calendar width
Merge pull request #472 from olga-jane/Settings

Issue #439