alarm and nfc
Merge branch 'alarm'