Merge remote-tracking branch 'origin/DashBoard' into DashBoard

f9d3339ed63.

Conflicts:
	Content/Site.css
	Controllers/Abstract/BaseController.cs
	Controllers/Abstract/BaseController1DL.cs
	Controllers/AccountController.cs
	Controllers/HomeController.cs
	Controllers/OptionsController.cs
	Controllers/RecipeController.cs
	Global.asax.cs
	Models/CoffeeModel.Designer.cs
	Models/CoffeeModel.edmx
	Models/Interface/IBase.cs
	Models/Recipe.cs
	Models/VMMenu.cs
	SLTest.csproj
	Service/Helper/MyPager.cs
	Views/Home/Administration.aspx
	Views/Home/Index.aspx
	Views/Home/Korzina.aspx
	Views/Options/Delete.aspx
	Views/Options/pvCreate.ascx
	Views/Options/pvEdit.ascx
	Views/Recipe/pvEdit.ascx
	Views/Shared/Site.Master
	Views/Web.config
	bin/SLTest.dll
	bin/SLTest.pdb
	web.config