Scheduling alarms
Merge remote-tracking branch 'origin/master'

Conflicts:
	HellsBells/AndroidManifest.xml