alarmManeger almost working

Signed-off-by: kloek <anton_p90@hotmail.com>
Merge branch 'master' of github.com:Triple-A/Hemmafesten

Signed-off-by: kloek <anton_p90@hotmail.com>

Conflicts:
	src/se/chalmers/hemmafesten/service/PartyService.java