modify MainActivity.java and activity_main.xml
modify manifest, activity_main
Merge branch 'master' of https://github.com/tzwm/SoundAlarm

Conflicts:
	AndroidManifest.xml
	gen/com/d2/soundalarm/R.java
	res/layout/activity_main.xml
fix last commit