rollback
Merge branch 'master' of //devsvr02/git/BitHR

Conflicts:
	Bit.Hr/Bit.Web.Ast/Areas/Assest/Controllers/DashboardController.cs
	Bit.Hr/Bit.Web.Ast/Areas/Assest/Views/Dashboard/Index.cshtml
	Bit.Hr/Bit.Web.Ast/Areas/Assest/Views/Dashboard/Index.generated.cs
	Bit.Hr/Bit.Web.Ast/Areas/Assest/Views/Web.config
	Bit.Hr/Bit.Web.Ast/Areas/Asset/Controllers/DashboardController.cs
	Bit.Hr/Bit.Web.Ast/Areas/Asset/Views/Dashboard/Index.cshtml
	Bit.Hr/Bit.Web.Ast/Areas/Asset/Views/Dashboard/Index.generated.cs
	Bit.Hr/Bit.Web.Ast/Areas/Asset/Views/Web.config
	Bit.Hr/Bit.Web.Emp/Areas/Asset/AssetAreaRegistration.cs
	Bit.Hr/Bit.Web.Emp/Areas/Asset/Controllers/DashboardController.cs
	Bit.Hr/Bit.Web.Emp/Areas/Asset/Views/Dashboard/Index.cshtml
	Bit.Hr/Bit.Web.Emp/Areas/Asset/Views/Dashboard/Index.generated.cs
	Bit.Hr/Bit.Web.Trn/Areas/TrainingCenter/Views/Web.config