Added to_json to Alarm
Reworked alarm endpoint urls
Merged