Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/support_v4_20_0_0.xml
	app/app.iml
	app/src/main/java/se/jrp/deptapp/Debt.java
	build/intermediates/dex-cache/cache.xml