Corrected indentation, as eclipse ignored settings completely, had to create own editor-preference schema, grrr...
Correct indentation in main activity
Merge branch 'master' into Service-Statemachine

Conflicts:
	src/ch/ffhs/esa/lifeguard/MainActivity.java
Remove redundant cast
Remove unused service binding
Add missing cursor close
Move cancellability from alarming to awating view