add message to notification
Merge branch 'master' of https://github.com/richk/ProjectBeacon
handle corner case of trigger Action null
Merge remote-tracking branch 'origin-richk/master'