_-db problem resolve
Resolve Conflicts:
	Cares.Web/Content/MainSite.css.map
	Cares.Web/Content/MainSite.min.css
	Repository/BaseRepository/Model.Views.cs