Tariff type Edit Screen created
Merge branch 'dev' of https://github.com/Innostark/Cares into dev

Conflicts:
	Cares.Web/Cares.Web.csproj
	Cares.Web/Web.config
	Interfaces/Repository/IFleetPoolRepository.cs