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

Conflicts:
	Projects/Common/Controls/Controls.csproj
	Projects/FireMonitor/Modules/GKModule/Journal/ViewModels/ArchiveViewModel.cs
	Projects/FireMonitor/Modules/GKModule/Watcher/Watcher.JournalSynchronisation.cs
	Tasks/GK/Sprint 2.txt