site
Merge remote-tracking branch 'remotes/origin/Logic' into temp_denis

Conflicts:
	nishtyachki/Identity_test2/Controllers/NishtController.cs
	nishtyachki/Identity_test2/Nishtiachki/Nishtiachok.cs
	nishtyachki/Identity_test2/Queue/User.cs
	nishtyachki/Identity_test2/Views/Home/Index.cshtml
fixed
resource and table in site
Merge branch 'temp_denis' into Site_branch

Conflicts:
	nishtyachki/Identity_test2/Nishtiachki/Nishtiachok.cs
	nishtyachki/Identity_test2/Queue/UsersQueue.cs
added admin delete method
fix
fix merge
auto kick user from queue

Signed-off-by: Artsiom Marozau <Artsiom_Marozau@epam.com>
Merge branch 'thread_fix' of https://github.com/FrozzyBoy/nishtyachki into thread_fix
change in view

Signed-off-by: Artsiom Marozau <Artsiom_Marozau@epam.com>
add block/unblock queue and info user page
Merge remote-tracking branch 'remotes/origin/thread_fix' into merge_branch

Conflicts:
	nishtyachki/Identity_test2/Services/IWcfService.cs
	nishtyachki/Identity_test2/Services/WcfService.svc.cs
	nishtyachki/nishtyachki/MainWindow.xaml.cs
	nishtyachki/nishtyachki/Service References/AdminApp/Reference.cs
	nishtyachki/nishtyachki/Service References/AdminApp/WcfService.wsdl
	nishtyachki/nishtyachki/Service References/AdminApp/WcfService.xsd
add default nishtiak
Merge remote-tracking branch 'remotes/origin/Denis_main_branch' into merge_branch
merged project