Initial Data
Merge remote-tracking branch 'origin/master'

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