ISSUE #7
Merge branch 'ConfirmAlarm' into Service-Statemachine

Conflicts:
	src/ch/ffhs/esa/lifeguard/alarm/AlarmService.java
	src/ch/ffhs/esa/lifeguard/alarm/context/ServiceAlarmContext.java
	src/ch/ffhs/esa/lifeguard/alarm/state/AlarmingState.java
	src/ch/ffhs/esa/lifeguard/alarm/state/AwaitingState.java