display medication name during alarm
unwanted changes

Conflicts:
	res/values/color.xml