fix
Merge branch 'ValikBranch' of https://github.com/DzianisPasiukou/ProjectForEpam into VladBranch

Conflicts:
	MvcApp/bin/LogicLayer.dll
	MvcApp/bin/MvcApp.dll
Merge branch 'Developers' of https://github.com/DzianisPasiukou/ProjectForEpam into VladBranch

Conflicts:
	MvcApp/bin/DataBaseLayer.dll
	MvcApp/bin/LogicLayer.dll
	MvcApp/bin/MvcApp.dll
Merge branch 'ValikBranch' of https://github.com/DzianisPasiukou/ProjectForEpam into VladBranch

Conflicts:
	LogicLayer/DatabaseHelper.cs
	MvcApp/App_Data/EpamProject.mdf
	MvcApp/Controllers/AccountController.cs
	MvcApp/Models/Account/AccountViewModels.cs
	MvcApp/bin/DataBaseLayer.dll
	MvcApp/bin/LoggingManager.dll
	MvcApp/bin/LogicLayer.dll
	MvcApp/bin/MvcApp.dll
commit.
Merge branch 'ValikBranch' of https://github.com/DzianisPasiukou/ProjectForEpam into MyBranch

Conflicts:
	MvcApp/App_Data/EpamProject.mdf
Revert "Revert "Test commit""

This reverts commit 4339b6168f3253943d42e3ec37661d42137a9ac6.
Revert "Revert "Revert "Test commit"""

This reverts commit e770c4fdc3ff5e7768225cb8b9442260aa7de24a.
Fix null exception in xml serialization in logging. Add treeview for viewer catalog in layouyt.
fix
Merge branch 'ValikBranch' of https://github.com/DzianisPasiukou/ProjectForEpam into VladBranch

Conflicts:
	LogicLayer/DatabaseHelper.cs
	MvcApp/App_Data/EpamProject.mdf
	MvcApp/Controllers/AccountController.cs
	MvcApp/Models/Account/AccountViewModels.cs
	MvcApp/bin/DataBaseLayer.dll
	MvcApp/bin/LogicLayer.dll
	MvcApp/bin/MvcApp.dll
DataBase v2.0
Fixed bug with layout
Merge branch 'VladBranch' of https://github.com/DzianisPasiukou/ProjectForEpam into MyBranch
data fix
fix
Merge branch 'VladBranch' of https://github.com/DzianisPasiukou/ProjectForEpam into MyBranch
+ log
Merge branch 'VladBranch' of https://github.com/DzianisPasiukou/ProjectForEpam into MyBranch
database changes.