ah solving conflicts again
ah
Merge branch 'master' of https://github.com/thomasleung/shakalarm

Conflicts:
	src/com/example/shakalarm/alert/AlarmAlertActivity.java
	src/com/example/shakalarm/alert/AlarmManagerBroadcastReceiver.java