Merge branch 'Return-loan-functionality'

Conflicts:
res/values/strings.xml