Branch: feature
Merge branch 'feature'

Conflicts:
	Debts/app/src/main/AndroidManifest.xml