test
Merge branch 'master' of https://github.com/antoniodecesare/Time2Pay

Conflicts:
	app/src/main/java/eu/antoniodecesare/time2pay/app/T2P.java
	build/intermediates/model_data.bin