pre rollback
Merge branch 'master' of https://github.com/gdgbari/ScoponeDaPolso
testati turni
.
Merge branch 'master' of https://github.com/gdgbari/ScoponeDaPolso

Conflicts:
	build/intermediates/model_data.bin