Merge commit 'd24c43b7efc4bb626c97d6a6e111d75f3e4f00c5' into dev

Conflicts:
	CatalogAppMVC/CatalogAppMVC/App_Data/DB/CatalogDatabase.mdf
	CatalogAppMVC/CatalogAppMVC/App_Data/DB/CatalogDatabase_log.ldf
	CatalogAppMVC/CatalogAppMVC/CatalogAppMVC.csproj
	CatalogAppMVC/CatalogAppMVC/Controllers/RecordsController.cs
	CatalogAppMVC/CatalogAppMVC/Models/interfaces/IRepository.cs
	CatalogAppMVC/CatalogAppMVC/Web.config
	CatalogAppMVC/CatalogAppMVC/packages.config
Исправил опечатку в конфиге.
Иправление конфликтов имен, конфига и т.д.
Merge branch 'dev' of https://github.com/TrainingASPTeamD/ProjectCatalogApp into dev

Conflicts:
	CatalogAppMVC/CatalogAppMVC/CatalogAppMVC.csproj
	CatalogAppMVC/CatalogAppMVC/Controllers/RecordsController.cs
	CatalogAppMVC/CatalogAppMVC/Models/interfaces/IRepository.cs
	CatalogAppMVC/CatalogAppMVC/Web.config
	CatalogAppMVC/CatalogAppMVC/packages.config