commit
Merge branch 'master' of github.com:xbadcode/Rubezh

Conflicts:
	Projects/FireMonitor/Modules/GKModule/GKModule.csproj
	Projects/FireMonitor/Modules/GKModule/Journal/ViewModels/ArchiveViewModel.cs
	Projects/FireMonitor/Modules/GKModule/Journal/ViewModels/JournalItemViewModel.cs
	Tasks/GK/Sprint 2.txt