Alarm + UI fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/com/example/TODO_List/TabsActivity.java