fixing notification error
Some work around for notification services. Adding lock screen timeout for prescription data
Merge branch 'master' of https://github.com/rjbailey/mystatus

# By Emily Chien (3) and Jake Bailey (2)
# Via Emily Chien
* 'master' of https://github.com/rjbailey/mystatus:
  Merge branch 'master' of https://github.com/rjbailey/mystatus
  Attempt at Snooze and Dismiss
  Notes and screenshots
  find -name *.java | xargs sed -i /.*@CD$/d
  Add separate ODK General Settings and ODK Admin Settings links to the home screen options menu.

Conflicts:
	myStatus/src/edu/washington/cs/mystatus/database/ODKSQLiteOpenHelper.java