for issue53 on branch 53, add buttton7, button8
on 53 branch to add another button9
Merge branch 'iss53'
add t5, t6
delete t5 at branch78
delete t6 at emergency branch
Merge branch 'issue78'
del t5 at terrible branch
del t3_hotfix on issue11 branch
fix conflict, both del t4, t5
Merge branch 'issue11'

Conflicts:
	src/com/example/setalarm/MainActivity.java