Tariff Type Edit and Add
Merge branch 'dev' of https://github.com/Innostark/Cares into dev

Conflicts:
	Cares.Web/Web.config
	Repository/TypeRegistrations.cs