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

Conflicts:
	Cares.Web/Cares.Web.csproj
	Cares.Web/Web.config
	Interfaces/Interfaces.csproj
	Models/Models.csproj
	Repository/BaseRepository/BaseDbContext.cs
	Repository/Repository.csproj
Merge branch 'dev' of https://github.com/Innostark/Cares into dev