predict0r
Merge branch 'master' of github.com:fldpi/SoberApp

Conflicts:
	SoberApp/app/src/main/java/soberapp/vis/ethz/ch/soberapp/data/Consume.java
Merge branch 'master' of github.com:fldpi/SoberApp
graph
Merge remote-tracking branch 'origin/master'

Conflicts:
	SoberApp/app/src/main/java/soberapp/vis/ethz/ch/soberapp/AlcoholLevelCalculator.java
	SoberApp/app/src/main/java/soberapp/vis/ethz/ch/soberapp/DrinksHistoryActivity.java