Tariff Type Cosmetic changes
Merge branch 'dev' of https://github.com/Innostark/Cares into dev

Conflicts:
	Cares.Web/Web.config