Commit
Merge remote-tracking branch 'origin/Les6' into Les6

Conflicts:
	les6/Les6/Les6.v12.suo
	les6/Les6/Les6/App_Data/aspnet-Les6-20141008143035.mdf
	les6/Les6/Les6/App_Data/aspnet-Les6-20141008143035_log.ldf
	les6/Les6/Les6/Controllers/AdminController.cs
	les6/Les6/Les6/Models/AdminViewModel.cs
	les6/Les6/Les6/Views/Admin/Index.cshtml
	les6/Les6/Les6/bin/Les6.dll
	les6/Les6/Les6/bin/Les6.pdb
	les6/Les6/Les6/obj/Debug/Les6.csprojResolveAssemblyReference.cache
	les6/Les6/Les6/obj/Debug/Les6.dll
	les6/Les6/Les6/obj/Debug/Les6.pdb