minor changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/at/schuschu/android/spsactivitymonitor/ActivityMonitoring.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/at/schuschu/android/spsactivitymonitor/ActivityMonitoring.java
minor changes