Files
Merge branch 'master' of https://github.com/Beer2Beer/KiloLiters

Conflicts:
	KiloLiters/.gradle/1.10/taskArtifacts/cache.properties.lock
	KiloLiters/app/src/main/res/layout/view_inserimento_dati.xml