new test
Revert "new test"

This reverts commit 1f095f9f07efc1ed82ddfac2cf7911865e9d5bd3.
add sound

Conflicts:
SmartAlarmApp/bin/SmartAlarmApp.apk
SmartAlarmApp/bin/resources.ap_
Merge branch 'master' of https://github.com/stevesun112/5115UIproject