partially added sound and disarm button listener
Merge remote-tracking branch 'origin/master'