Committing so I can merge. Nothing is broken here, but 12h
if-notification-is-not-heeded notification functionality is incomplete.
* Merged Chris' changes w/ mine.
* Removed some toasts.
Merge branch 'master' of https://github.com/nupmmarkbegale/Intellicare-Template

Conflicts:
	IntellicareTemplate/project.properties
	Mantra/AndroidManifest.xml
	Slumber Time/res/values/strings.xml
	Social Force/res/layout/activity_main.xml
	Social Force/src/edu/northwestern/cbits/intellicare/socialforce/MainActivity.java