WIP: Adding notifications
More work in progress for notifications

Mostly working now, just need to tidy up the interface, fix the icon and
support "x hours from now"
Changed to using the medkit icon for the reminders
Stopped cancelling notifications

Notifications used to get cancelled when creating new ones. No longer.
Sounds and Vibrate settings now working
Merge branch 'master' into notifications

Conflicts:
	app/src/main/java/uk/co/pilllogger/activities/AddConsumptionActivity.java
Added the ability to set a reminder in X hours