menu
Changes
Merge branch 'master' of https://github.com/elf11/ShareNCare

Conflicts:
	app/src/main/res/values/strings.xml