Revision Number
Merge branch 'dev' of https://github.com/Innostark/Cares into dev

Conflicts:
	Repository/Repositories/TarrifTypeRepository.cs
Tariff Type Revisions
Merge branch 'dev' of https://github.com/Innostark/Cares into dev