Merge pull request #55 from michaelfung/master

update alarm api
remove the "alarm_status" in get_alarm API
Add cat_main field for each category
correct error