-Additional Charge Add/Delete
Conflicts:
	Cares.Web/Web.config
	Repository/App.config
	Repository/BaseRepository/Model.edmx
Additional Charge

-Add
-Edit
-Delete
Merge branch 'dev2' of https://github.com/Innostark/Cares into dev2

Conflicts:
	Cares.Web/Content/MainSite.min.css
	Repository/BaseRepository/Model.Designer.cs
	Repository/BaseRepository/Model.Views.cs