Merge branch 'master' into temp

Conflicts:
	Src/OpenCBS.Manager/Contracts/LoanManager.cs
	Src/OpenCBS.Services/LoanServices.cs