Organizing the files
Merge branch 'master' of https://github.com/thomasleung/shakalarm

Conflicts:
	shakalarm/src/alarm/alert/AlarmAlertActivity.java
	shakalarm/src/alarm/alert/MathProblem.java