Merge remote-tracking branch 'origin/lm' into lm

# Conflicts:
#	app/src/main/java/com/example/ueberwachungssystem/Beschleunigungssensor.java