UI/functionality changes to main.xml, alarm.xml
Merge branch 'master' of https://github.com/sisun1030/REM into uimark2