clean up
Merge branch 'master' of https://github.com/thomasleung/shakalarm.git

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