-Addtional charge
Merge branch 'dev2' of https://github.com/Innostark/Cares into dev2

Conflicts:
	Cares.Web/Areas/Pricing/Controllers/TariffController.cs
	Cares.Web/Cares.Web.csproj
	Implementation/TypeRegistrations.cs
	Interfaces/Cares.Interfaces.csproj
	Repository/BaseRepository/Model.Views.cs
	Repository/BaseRepository/Model.edmx
	Repository/BaseRepository/Model.edmx.diagram
	Repository/TypeRegistrations.cs