Dat 1.0 version
Merge remote-tracking branch 'origin/master'

Conflicts:
	KiloLiters/app/src/main/java/it/beer2beer/kiloliters/MainActivity.java
Dat 1.0 version (v1.1)